- wine-devel - winehq.org

[PATCH] kernel32: Fix the formatting of an NLS_IsUnicodeOnlyLcid() trace.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/lcformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 47f55b4b27d..a9dfbf09be2 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -333,7 +333,7 @@ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) case LANG_MARATHI: case LANG_PUNJABI: case LANG_SANSKRIT: - TRACE("lcid 0x%08x: langid 0x%4x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); + TRACE("lcid 0x%08x: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); return TRUE; default: return FALSE; -- 2.20.1

1 0

Re: [PATCH 1/2] server: Only remove non-listening fd from poll
by Zebediah Figura (she/her) 05 Jul '21

05 Jul '21

On 7/4/21 3:11 PM, David Koolhoven wrote: > On Fri, Jul 02, 2021 at 02:33:09PM -0500, Zebediah Figura (she/her) wrote: >> On 7/2/21 1:06 PM, David Koolhoven wrote: >>> This makes sure we poll listening non-connection >>> file descriptors even if the event is POLLERR or POLLHUP. >>> >>> Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> >>> --- >>> server/sock.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/server/sock.c b/server/sock.c >>> index befa9117c13..ce2f390ec05 100644 >>> --- a/server/sock.c >>> +++ b/server/sock.c >>> @@ -1024,7 +1024,7 @@ static void sock_poll_event( struct fd *fd, int event ) >>> fprintf(stderr, "socket %p select event: %x\n", sock, event); >>> >>> /* we may change event later, remove from loop here */ >>> - if (event & (POLLERR|POLLHUP)) set_fd_events( sock->fd, -1 ); >>> + if (event & (POLLERR|POLLHUP) && sock->state != SOCK_LISTENING) set_fd_events( sock->fd, -1 ); >>> >>> switch (sock->state) >>> { >>> >> >> This doesn't look right. Why do we need to do this? >> > I wish I could wrap my head around a way to make it work > without this, but without the change the next patch causes > port to stop being used and network > communications meant for that fd stop. Wait, I'm confused, is this hunk necessary or not? Is Star Citizen or World of Warcraft getting an error on the listening descriptor, and, if so, why? > I know there's some sort of restructuring of these calls > that would do it, but I can't think of any "Leave things > mostly the way they are" that would accomplish wineserver > releasing back to the kernel if it's spinning in a loop in > this situation besides something even worse like a call to > sched_yield() wineserver definitely shouldn't be spinning in a loop at all, so patch 2/2 has the right idea at least in that respect. (P.S. As I gather that this patch was written by Torge Matthies from his response, it would probably be good to credit him, either as the patch author or as someone whose patch this is based on. See also [1].) [1] https://wiki.winehq.org/Submitting_Patches#Submitting_patches_written_by_so…

1 0

[PATCH] programs/winetest: Report GetLastError() when CreateProcess() fails.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sometimes httpapi_test.exe fails to run but in such a case the only information we get in the report is the run_ex() return code, -2, which does not tell us anything about what happened: https://test.winehq.org/data/patterns.html#httpapi:httpapi With this patch the done line will contain the GetLastError() value which I expect to be ERROR_FILE_NOT_FOUND (2) due to the anti-virus quarantining our test executable. So 'done (-2)' will be replaced by 'done (-2)' and that changes everything ;-). I may even get 'done (-3)' one day. Weeeee! More seriously. This value is overloaded quite a bit: * It can be the test's exit code (a failure count). * Or an exception 'exit code' (e.g. c0000005 -> -1073741819). * Or a WaitForSingleObject() return value (typically 258). * Or the CreateProcess() -GetLastError() (expecting -2 here). But that's probably still fine. --- programs/winetest/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 64a807b6c73..81c7de2a020 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -811,6 +811,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s\n", test->name, subtest, file); status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); + if (status == -2) status = -GetLastError(); heap_free (cmd); xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); if (status) failures++; -- 2.20.1

1 0

[PATCH 1/4] server: Don't check the user data for NULL in async_terminate().
by Zebediah Figura 05 Jul '21

05 Jul '21

This semantically reverts 481517178ff7dd542966d7f11f3d61b3fc8a0776. That commit was used to implement NtFlushBuffersFile, which at the time didn't use a callback function. 9050b58f0769fca75c4cebed7be3cce51989814e changed it to use irp_completion(), since the result of a blocking flush needed to be taken from the IOSB. As of 97afac469fbe012e22acc1f1045c88b1004a241f that's not true anymore, but on the other hand it is theoretically possible for a device driver to touch the Information member of the IOSB, and we don't seem to lose anything by making all asyncs take a common path. Since all asyncs pass user data and there's no clear reason for them not to, let's get rid of a bit of extra code complexity that's no longer used. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/async.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/server/async.c b/server/async.c index 4dedb27f3d8..0425e4eddf7 100644 --- a/server/async.c +++ b/server/async.c @@ -161,18 +161,14 @@ void async_terminate( struct async *async, unsigned int status ) if (!async->direct_result) { - if (async->data.user) - { - apc_call_t data; + apc_call_t data; - memset( &data, 0, sizeof(data) ); - data.type = APC_ASYNC_IO; - data.async_io.user = async->data.user; - data.async_io.sb = async->data.iosb; - data.async_io.status = status; - thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); - } - else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); + memset( &data, 0, sizeof(data) ); + data.type = APC_ASYNC_IO; + data.async_io.user = async->data.user; + data.async_io.sb = async->data.iosb; + data.async_io.status = status; + thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); } async_reselect( async ); -- 2.30.2

1 3

[tools] winetest: Identify and highlight tests with too much output.
by Francois Gouget 05 Jul '21

05 Jul '21

Regular failures are more important so only highlight this problem if the test has no other issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51352 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The status of old reports can be updated by following the steps below after applying today's two patches. But that's not a requirement. * Update the summary.txt files generated by dissect to use the new big and virus codes. cd winetest/data find `pwd`/ -name report -print | \ nice xargs -P8 -n 1 dissect --update * Generate each build's testresults.txt file with gather: find `pwd`/ -name total.txt -print | \ while read p; do dirname $p; done | \ nice xargs -P8 -n 1 gather --update * Generate the new pattern pages with build-patterns: build-patterns build-index The paths to the scripts should be adjusted as appropriate. Also adjust -P8 for the desired level of parallelism. Here refreshing my test.winehq.org mirror with -P8 takes under 5 minutes. Since I have the same set of reports the time should be similar on winehq.org. --- winetest/build-patterns | 1 + winetest/dissect | 9 +++++++-- winetest/gather | 12 ++++++++++-- winetest/report.css | 3 +++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index da7272e56..0b33512a7 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -934,6 +934,7 @@ my %status2html = ( "skipped" => ["-", "s", "skipped by user request", "", ""], "crash" => ["C", "C", "crash", "t", ""], "258" => ["T", "T", "timeout", "t", ""], + "big" => ["B", "B", "too much output", "t", ""], ); # Returns a tuple containing the symbol, CSS class, title, link type and diff --git a/winetest/dissect b/winetest/dissect index 33cfb0a56..3f89e1064 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -267,7 +267,7 @@ open IN, "<:raw", $report or mydie "could not open '$report' for reading: $!"; # - <dll> - skipped - - - - # - <dll> <unit> skipped - - - <source> # - <dll> <unit> failed (258|crash) - - <source> -# - <dll> <unit> <total> <todo> <failures> <skipped> <source> +# - <dll> <unit> <total> <todo> (<failures>|big) <skipped> <source> open SUM, ">$tmpdir/summary.txt" or mydie "could not open '$tmpdir/summary.txt' for writing: $!"; my $line = <IN> || ""; @@ -599,10 +599,12 @@ sub close_test_unit($) $todo ||= $s_todo; $skipped ||= $s_skipped; + my $toobig; if ($unitsize > $maxunitsize) { add_test_line("end", "The test prints too much data ($unitsize bytes)"); $extra_failures++; + $toobig = 1; } if (!$broken and defined $rc) { @@ -637,7 +639,10 @@ sub close_test_unit($) } $failures += $extra_failures; - $summary = "$s_total $todo $failures $skipped" if (!defined $summary); + if (!defined $summary) + { + $summary = "$s_total $todo " . (($toobig and $failures == 1) ? "big" : $failures) . " $skipped"; + } print SUM "- $dll $unit $summary $source\n"; $testbox->{pattern} = "$dll:$unit" if ($failures); if ($failures && ++$failed_units > $maxfailedtests) { diff --git a/winetest/gather b/winetest/gather index abb339598..e6d5a9a30 100755 --- a/winetest/gather +++ b/winetest/gather @@ -356,7 +356,12 @@ foreach my $file (glob "$builddir/*/summary.txt") { skips => [ 1, 1 ] }; } else { - $report->{$testname} = { status => "run", + my $status = "run"; + if ($errors eq "big") { + $status = "big"; + $errors = 1; + } + $report->{$testname} = { status => $status, count => [ $count, $count ], errors => [ $errors, $errors ], todos => [ $todos, $todos ], @@ -409,7 +414,8 @@ sub merge_status($$) } elsif ($group_result->{status} eq "run" and $result->{status} =~ /^missing/) { ; # Nothing to do - } elsif ($group_result->{status} ne $result->{status}) { + } elsif (($group_result->{status} =~ /^(?:run|big)$/) ne + ($result->{status} =~ /^(?:run|big)$/)) { $group_result->{status} = "mixed"; } @@ -640,6 +646,7 @@ sub get_result_title($$) if ($result->{status} eq "mixed") { return "Mixed results"; } if ($result->{status} eq "crash") { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } + if ($result->{status} eq "big") { return "Too much output"; } if ($result->{status} eq "skipped") { return "Skipped by user request"; } my ($dll, $unit) = split(/:/, $testname); @@ -725,6 +732,7 @@ sub singletest($$$) { skipped => "skipped", native => "native", crash => "crashed", + big => "too big", 258 => "timeout", mixed => "mixed", ); diff --git a/winetest/report.css b/winetest/report.css index b558c6ff7..bd8b73fec 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -92,6 +92,9 @@ div.pattern :hover { color: black; text-decoration: underline; } background-color: #ff5555; } /* .patF failure(s) */ +.patB { /* too much output */ + background-color: #ffffb3; +} /* .patn not run for an unknown reason */ /* .patm missing dll */ .pate { /* missing entrypoint */ -- 2.20.1

1 0

[tools] winetest: Detect and report tests blocked by anti-virus tools.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This happened to httpapi:httpapi: https://test.winehq.org/data/patterns.html#httpapi:httpapi WineTest also sometimes fails to run this test (error -2) but does not report the GetLastError(). I suspect these are cases where the test executable was quarantined by the anti-virus. It used to be possible to disable Microsoft Defender through the registry but then that stopped working and WineTest.exe started getting blocked by the anti-virus. Since disabling Microsoft Defender is no longer possible I told it to ignore the directory where WineTest.exe is downloaded and that helped. But WineTest.exe does not extract the tests in that directory which lead to the current round of issues. So I will have to update some configuration snapshots and/or the TestBot. Again :-( --- winetest/build-patterns | 1 + winetest/dissect | 5 +++++ winetest/gather | 10 ++++++++-- winetest/report.css | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 0b33512a7..d530ad2f8 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -929,6 +929,7 @@ my %status2html = ( "missingsxs" => ["v", "v", "missing side-by-side dll version", "version", ""], "stub" => ["u", "u", "stub Windows dll", "version", ""], "native" => ["N", "N", "native Windows dll", "version", ""], + "loaderror225" => ["V", "V", "blocked by the anti-virus", "version", ""], "loaderror258" => ["I", "I", "timed out while getting the test list", "version", ""], # Other status values "skipped" => ["-", "s", "skipped by user request", "", ""], diff --git a/winetest/dissect b/winetest/dissect index 3f89e1064..55d0a7299 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -937,6 +937,11 @@ foreach my $dll (sort keys %dllinfo) $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">timed out getting the test list</td></tr>\n", escapeHTML($dll); } + elsif ($dllinfo{$dll}->{version} eq "load error 225") + { + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">test blocked by the anti-virus</td></tr>\n", + escapeHTML($dll); + } elsif ($dllinfo{$dll}->{version} =~ /^load error (\d+)$/) { # Flag unknown errors diff --git a/winetest/gather b/winetest/gather index e6d5a9a30..5aabe4e48 100755 --- a/winetest/gather +++ b/winetest/gather @@ -663,8 +663,10 @@ sub get_result_title($$) if ($result->{status} =~ /^loaderror(.*)$/) { my $code = $1; - return "Not run because getting the test list ". - ($code eq "258" ? "timed out" : "failed with error $code"); + return $code eq "225" ? + "Not run because the test was blocked by the anti-virus" : + ("Not run because getting the test list ". + ($code eq "258" ? "timed out" : "failed with error $code")); } if ($result->{status} eq "native") { return "Not run because $dll is a native Windows dll (not allowed for Wine tests)"; } if ($result->{status} eq "stub") { return "Not run because $dll is a stub Windows dll"; } @@ -716,6 +718,10 @@ sub singletest($$$) { !$result->{errors}->[1] ? $result->{todos}->[1] : "$result->{errors}->[1]+$result->{todos}->[1]"; } + elsif ($status eq "loaderror225") + { + $msg = "virus"; + } elsif ($status =~ /^loaderror/) { $msg = "no list"; diff --git a/winetest/report.css b/winetest/report.css index bd8b73fec..4594c5d49 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -116,6 +116,9 @@ div.pattern :hover { color: black; text-decoration: underline; } .patL { /* error while getting the test list */ background-color: #80aaff; } +.patV { /* test blocked by the anti-virus */ + background-color: #99e6ff; +} .commitR { color: #cc0000; -- 2.20.1

1 0

[PATCH] ntdll/tests: Improve the RtlWaitOnAddress() timeout checks.
by Francois Gouget 05 Jul '21

05 Jul '21

GetTickCount()'s granularity represents 15% of the time we want to mesure, making it hard to not get failures. So use NtQuerySystemTime() instead since we already depend on it. Narrow down the acceptable range again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- We still got a couple of failures after the acceptable elapsed time range was widened in an attempt to account for GetTickCount()'s granularity: https://test.winehq.org/data/patterns.html#ntdll:om om.c:2322: Test failed: got 78 om.c:2307: Test failed: got 62 With this patch I did not get any failures in thousands of runs but it was already really hard to reproduce (<1%) so it's not a 100% guarantee that it will work now. --- dlls/ntdll/tests/om.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 82f8188d176..81be7de00f6 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2266,10 +2266,10 @@ static void test_semaphore(void) static void test_wait_on_address(void) { - DWORD ticks; SIZE_T size; NTSTATUS status; - LARGE_INTEGER timeout; + LARGE_INTEGER start, end, timeout; + DWORD elapsed; LONG64 address, compare; if (!pRtlWaitOnAddress) @@ -2298,13 +2298,13 @@ static void test_wait_on_address(void) /* values match */ address = 0; compare = 0; - pNtQuerySystemTime(&timeout); - timeout.QuadPart += 100*10000; - ticks = GetTickCount(); + pNtQuerySystemTime(&start); + timeout.QuadPart = start.QuadPart + 100 * 10000; status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); - ticks = GetTickCount() - ticks; + pNtQuerySystemTime(&end); ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2314,12 +2314,13 @@ static void test_wait_on_address(void) compare = ~0; compare <<= size * 8; + pNtQuerySystemTime(&start); timeout.QuadPart = -100 * 10000; - ticks = GetTickCount(); status = pRtlWaitOnAddress(&address, &compare, size, &timeout); - ticks = GetTickCount() - ticks; + pNtQuerySystemTime(&end); ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status); -- 2.20.1

1 0

[PATCH] ntdll/tests: TZinfo sometimes does not get a MUI string.
by Francois Gouget 05 Jul '21

05 Jul '21

RtlQuery*TimeZoneInformation() should return a MUI string but there are rare cases where it does not in Windows 10 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Specifically this is the case for w10pro64. But the same Windows version with just the language packs installed behaves as expected. Yet the ntdll version did not change so it should not be that RtlQuery*TimeZoneInformation() behaves differently. --- dlls/ntdll/tests/time.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 90737521a4d..ee683e9a0aa 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -234,10 +234,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryDynamicTimeZoneInformation(&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryDynamicTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); @@ -251,10 +253,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); @@ -262,10 +266,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); -- 2.20.1

1 0

[PATCH 1/5] d3d11: Only complain once about d3d10 interface emulation in d3d11_device_context_SwapDeviceContextState().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d043af7051a..f8bd8578cdc 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2980,6 +2980,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11 struct d3d_device_context_state *state_impl, *prev_impl; struct d3d_device *device = context->device; struct wined3d_state *wined3d_state; + static unsigned int once; TRACE("iface %p, state %p, prev %p.\n", iface, state, prev); @@ -3010,7 +3011,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11 device->state = state_impl; d3d_device_context_state_private_release(prev_impl); - if (d3d_device_is_d3d10_active(device)) + if (d3d_device_is_d3d10_active(device) && !once++) FIXME("D3D10 interface emulation not fully implemented yet!\n"); wined3d_mutex_unlock(); } -- 2.20.1

2 1

[PATCH 5/5] wined3d: Use wined3d_mask_from_size() in wined3d_render_pass_vk_init().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f91261ebbbe..cbff3968179 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1154,7 +1154,7 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, rt_count = 0; attachment_count = 0; - mask = key->rt_mask & ((1u << WINED3D_MAX_RENDER_TARGETS) - 1); + mask = key->rt_mask & wined3d_mask_from_size(WINED3D_MAX_RENDER_TARGETS); while (mask) { i = wined3d_bit_scan(&mask); @@ -1181,7 +1181,7 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, rt_count = i + 1; } - mask = ~key->rt_mask & ((1u << rt_count) - 1); + mask = ~key->rt_mask & wined3d_mask_from_size(rt_count); while (mask) { i = wined3d_bit_scan(&mask); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use wined3d_mask_from_size() in wined3d_context_vk_apply_draw_state().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 87fcb868197..f91261ebbbe 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3231,7 +3231,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STENCIL_REF) && dsv) { VK_CALL(vkCmdSetStencilReference(vk_command_buffer, VK_STENCIL_FACE_FRONT_AND_BACK, - state->stencil_ref & ((1 << dsv->format->stencil_size) - 1))); + state->stencil_ref & wined3d_mask_from_size(dsv->format->stencil_size))); } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC)) -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in state_stencil().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 264a9974b40..a9183278d86 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1072,7 +1072,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(d->desc.back.func))) func_back = GL_ALWAYS; mask = d->desc.stencil_read_mask; - ref = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + ref = state->stencil_ref & wined3d_mask_from_size(state->fb.depth_stencil->format->stencil_size); stencilFail = gl_stencil_op(d->desc.front.fail_op); depthFail = gl_stencil_op(d->desc.front.depth_fail_op); stencilPass = gl_stencil_op(d->desc.front.pass_op); -- 2.20.1

1 0

[PATCH 2/5] d2d1: Do not clear the device context state in d2d_device_context_draw().
by Henri Verbeet 05 Jul '21

05 Jul '21

Clearing the state should no longer be needed now that we use SwapDeviceContextState() and have our own dedicated state object. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 3b444321c87..44840f0010f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -139,7 +139,6 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D11Device1_GetImmediateContext1(device, &context); ID3D11DeviceContext1_SwapDeviceContextState(context, render_target->d3d_state, &prev_state); - ID3D11DeviceContext1_ClearState(context); ID3D11DeviceContext1_IASetInputLayout(context, shape_resources->il); ID3D11DeviceContext1_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); -- 2.20.1

1 0

[PATCH 8/8] gdi32: Move CreateDiscardableBitmap implementation to objects.c.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 18 ------------------ dlls/gdi32/objects.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 18 deletions(-)

2 1

[PATCH 7/8] gdi32: Use ntgdi names for bitmap functions.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 18 +++++++++--------- dlls/gdi32/gdi32.spec | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-)

2 1

[PATCH 6/8] gdi32: Introduce NtGdiCreateBitmap.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 8 ++++---- dlls/gdi32/objects.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-)

2 1

[PATCH 5/8] gdi32: Implement CreateBitmapIndirect on top of CreateBitmap.
by Jacek Caban 05 Jul '21

05 Jul '21

Instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 121 ++++++++++++------------------------------- dlls/gdi32/objects.c | 15 ++++++ 2 files changed, 49 insertions(+), 87 deletions(-)

2 1

[PATCH 4/8] gdi32: Introduce NtGdiCreatePen.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 9 +++++++++ dlls/gdi32/pen.c | 33 ++++++++++++++------------------- include/ntgdi.h | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-)

2 1

[PATCH 3/8] gdi32: Implement CreatePenIndirect on top of CreatePen.
by Jacek Caban 05 Jul '21

05 Jul '21

Instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 8 ++++++++ dlls/gdi32/pen.c | 32 ++++++++------------------------ 2 files changed, 16 insertions(+), 24 deletions(-)

2 1

[PATCH 2/8] gdi32: Reimplement GetObjectA on top of GetObjectW.
by Jacek Caban 05 Jul '21

05 Jul '21

2 1

[PATCH 1/8] gdi32: Introduce NtGdiExtGetObjectW.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 10 ++++------ dlls/gdi32/objects.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-)

2 1

[PATCH] wined3d: Factor out most of the execute_command_list callback to a common function.
by Zebediah Figura 05 Jul '21

05 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 51 ++++++++++++++++------------------ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c5fc8fbb7a6..24f35298879 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2353,25 +2353,13 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context, query->state = QUERY_SIGNALLED; } -static void wined3d_cs_execute_command_list(struct wined3d_device_context *context, +static void wined3d_cs_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list, bool restore_state) { - struct wined3d_cs_execute_command_list *op; SIZE_T i; - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; - op->list = list; - for (i = 0; i < list->resource_count; ++i) wined3d_resource_acquire(list->resources[i]); - - wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); - - if (restore_state) - wined3d_device_context_set_state(context, context->state); - else - wined3d_device_context_reset_state(context); } static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) @@ -2962,6 +2950,25 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo } } +void wined3d_device_context_emit_execute_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list, bool restore_state) +{ + struct wined3d_cs_execute_command_list *op; + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; + op->list = list; + + context->ops->acquire_command_list(context, list); + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); + + if (restore_state) + wined3d_device_context_set_state(context, context->state); + else + wined3d_device_context_reset_state(context); +} + static void *wined3d_cs_st_require_space(struct wined3d_device_context *context, size_t size, enum wined3d_cs_queue_id queue_id) { @@ -3042,7 +3049,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, - wined3d_cs_execute_command_list, + wined3d_cs_acquire_command_list, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3168,7 +3175,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, - wined3d_cs_execute_command_list, + wined3d_cs_acquire_command_list, }; static void poll_queries(struct wined3d_cs *cs) @@ -3561,20 +3568,10 @@ static void wined3d_deferred_context_acquire_resource(struct wined3d_device_cont wined3d_resource_incref(resource); } -static void wined3d_deferred_context_execute_command_list(struct wined3d_device_context *context, +static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list, bool restore_state) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - struct wined3d_cs_execute_command_list *op; - - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; - op->list = list; - - if (restore_state) - wined3d_device_context_set_state(context, context->state); - else - wined3d_device_context_reset_state(context); /* Grab a reference to the command list. Note that this implicitly prevents * any dependent command lists or resources from being freed as well. */ @@ -3596,7 +3593,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_issue_query, wined3d_deferred_context_flush, wined3d_deferred_context_acquire_resource, - wined3d_deferred_context_execute_command_list, + wined3d_deferred_context_acquire_command_list, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 55879e546f2..c550899466f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4908,7 +4908,7 @@ void CDECL wined3d_device_context_execute_command_list(struct wined3d_device_con { TRACE("context %p, list %p, restore_state %d.\n", context, list, restore_state); - context->ops->execute_command_list(context, list, restore_state); + wined3d_device_context_emit_execute_command_list(context, list, restore_state); } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36e1fa4ec7a..5ba00871222 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4717,8 +4717,7 @@ struct wined3d_device_context_ops void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); - void (*execute_command_list)(struct wined3d_device_context *context, - struct wined3d_command_list *list, bool restore_state); + void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); }; struct wined3d_device_context @@ -4798,6 +4797,8 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_execute_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list, bool restore_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, -- 2.30.2

2 1

[PATCH 4/5] user32: Introduce a SCROLL_DrawNCScrollBar() to draw scroll bars in non-client area.
by Zhiyi Zhang 05 Jul '21

05 Jul '21

Having a SCROLL_DrawNCScrollBar() in scroll.c enables it to access global variables there. So that global variables access in SCROLL_DrawScrollBar() can be moved outside of it and SCROLL_DrawScrollBar() can then be refactored into a function without access to global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/controls.h | 1 + dlls/user32/nonclient.c | 6 +----- dlls/user32/scroll.c | 8 ++++++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 0b0f1c28015..78b393fcddb 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -179,6 +179,7 @@ extern BOOL NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down ) DECLSPEC_HIDDEN; extern void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DECLSPEC_HIDDEN; /* scrollbar */ +extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) DECLSPEC_HIDDEN; extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index e56c03deaf0..50ecb0c4e2e 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1027,11 +1027,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); /* Draw the scroll-bars */ - - if (dwStyle & WS_VSCROLL) - SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); - if (dwStyle & WS_HSCROLL) - SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + SCROLL_DrawNCScrollBar( hwnd, hdc, dwStyle & WS_HSCROLL, dwStyle & WS_VSCROLL ); /* Draw the "size-box" */ if ((dwStyle & WS_VSCROLL) && (dwStyle & WS_HSCROLL)) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 9113d57263b..5fc75ca42e7 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -646,6 +646,14 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, } } +void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) +{ + if (draw_horizontal) + SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + if (draw_vertical) + SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); +} + /*********************************************************************** * SCROLL_DrawSizeGrip * -- 2.30.2

2 1

[PATCH] uxtheme: Avoid memory leaks.
by Zhiyi Zhang 05 Jul '21

05 Jul '21

A THEME_FILE struct and four global ATOMs are leaked when unloading uxtheme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/main.c | 3 +++ dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxthemedll.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 5e5610a1f84..0b852b06fc7 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -39,6 +39,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); UXTHEME_InitSystem(hInstDLL); break; + case DLL_PROCESS_DETACH: + UXTHEME_UninitSystem(); + break; } return TRUE; } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index b18794740a8..dcd2a660042 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -509,6 +509,16 @@ void UXTHEME_InitSystem(HINSTANCE hInst) UXTHEME_LoadTheme(); } +void UXTHEME_UninitSystem(void) +{ + MSSTYLES_SetActiveTheme(NULL, FALSE); + + GlobalDeleteAtom(atWindowTheme); + GlobalDeleteAtom(atSubAppName); + GlobalDeleteAtom(atSubIdList); + GlobalDeleteAtom(atDialogThemeEnabled); +} + /*********************************************************************** * IsAppThemed (UXTHEME.@) */ diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index fee152c9c34..fdf529b422a 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -95,6 +95,7 @@ HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, ParseThemeIniFileProc callback, LPVOID lpData) DECLSPEC_HIDDEN; extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; +extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; /* No alpha blending */ #define ALPHABLEND_NONE 0 -- 2.30.2

1 0

[PATCH 5/5] user32: Call SCROLL_DrawScrollBar() to draw arrows in SCROLL_HandleScrollEvent().
by Zhiyi Zhang 05 Jul '21

05 Jul '21

So that SCROLL_DrawScrollBar() can eventually be hooked by a themed scroll bar drawing function and use a single function to draw scroll bars, instead of hooking multiple scroll bar drawing functions that draw different parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/controls.h | 15 ++++++++++++++- dlls/user32/scroll.c | 33 ++++++++++----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 78b393fcddb..9bb6a0047d1 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -179,8 +179,21 @@ extern BOOL NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down ) DECLSPEC_HIDDEN; extern void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DECLSPEC_HIDDEN; /* scrollbar */ + +/* Scroll-bar hit testing */ +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; + extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) DECLSPEC_HIDDEN; -extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; +extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, + BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; /* combo box */ diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 5fc75ca42e7..01868bd4238 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -74,17 +74,6 @@ typedef struct /* Scroll timer id */ #define SCROLL_TIMER 0 - /* Scroll-bar hit testing */ -enum SCROLL_HITTEST -{ - SCROLL_NOWHERE, /* Outside the scroll bar */ - SCROLL_TOP_ARROW, /* Top or left arrow */ - SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ - SCROLL_THUMB, /* Thumb rectangle */ - SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ - SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ -}; - /* What to do after SCROLL_SetScrollInfo() */ #define SA_SSI_HIDE 0x0001 #define SA_SSI_SHOW 0x0002 @@ -583,8 +572,8 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, * * Redraw the whole scrollbar. */ -void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, - BOOL arrows, BOOL interior ) +void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, BOOL arrows, + BOOL interior ) { INT arrowSize, thumbSize, thumbPos; RECT rect; @@ -611,8 +600,8 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, { if( vertical == SCROLL_trackVertical && GetCapture() == hwnd ) SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - (SCROLL_trackHitTest == SCROLL_TOP_ARROW), - (SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW) ); + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_TOP_ARROW, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_BOTTOM_ARROW ); else SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, FALSE, FALSE ); @@ -649,9 +638,9 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) { if (draw_horizontal) - SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, SCROLL_trackHitTest, TRUE, TRUE ); if (draw_vertical) - SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, SCROLL_trackHitTest, TRUE, TRUE ); } /*********************************************************************** @@ -684,7 +673,7 @@ static void SCROLL_RefreshScrollBar( HWND hwnd, INT nBar, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW) ); if (!hdc) return; - SCROLL_DrawScrollBar( hwnd, hdc, nBar, arrows, interior ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_trackHitTest, arrows, interior ); ReleaseDC( hwnd, hdc ); } @@ -831,8 +820,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_TOP_ARROW: - SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - (hittest == SCROLL_trackHitTest), FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, TRUE, FALSE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -929,8 +917,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_BOTTOM_ARROW: - SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - FALSE, (hittest == SCROLL_trackHitTest) ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, TRUE, FALSE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -1430,7 +1417,7 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); } else - SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, SCROLL_trackHitTest, TRUE, TRUE ); if (!wParam) EndPaint(hwnd, &ps); } break; -- 2.30.2

1 0

[PATCH 3/5] user32: Modify SCROLL_MovingThumb outside of SCROLL_DrawMovingThumb().
by Zhiyi Zhang 05 Jul '21

05 Jul '21

SCROLL_MovingThumb is a global variable. Gradually move it out of scroll bar drawing functions so that those drawing functions can be refactored in a way that doesn't need access to global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/scroll.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 85485eede57..9113d57263b 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -484,8 +484,6 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, SCROLL_DrawInterior( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, rect, arrowSize, thumbSize, pos, 0, vertical, FALSE, FALSE ); - - SCROLL_MovingThumb = !SCROLL_MovingThumb; } /*********************************************************************** @@ -625,6 +623,7 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, if (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) { SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + SCROLL_MovingThumb = FALSE; } else { @@ -867,7 +866,10 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) vertical, SCROLL_TrackingPos ); if (!SCROLL_MovingThumb) + { SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); + SCROLL_MovingThumb = TRUE; + } } else if (msg == WM_LBUTTONUP) { -- 2.30.2

1 0

[PATCH 2/5] user32: Remove SCROLL_DrawInterior_9x().
by Zhiyi Zhang 05 Jul '21

05 Jul '21

SCROLL_DrawInterior_9x() has the same functionality as SCROLL_DrawInterior(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/scroll.c | 102 +++---------------------------------------- 1 file changed, 5 insertions(+), 97 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index ba8fe7966ec..85485eede57 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -108,11 +108,9 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV ); static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, const SCROLLINFO *info, BOOL bRedraw ); -static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar, - RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, - UINT flags, BOOL vertical, - BOOL top_selected, BOOL bottom_selected ); +static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, + INT thumbSize, INT thumbPos, UINT flags, BOOL vertical, + BOOL top_selected, BOOL bottom_selected ); /********************************************************************* @@ -484,9 +482,8 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, else if( pos > max_size ) pos = max_size; - SCROLL_DrawInterior_9x( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, - rect, arrowSize, thumbSize, pos, - 0, vertical, FALSE, FALSE ); + SCROLL_DrawInterior( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, rect, arrowSize, thumbSize, pos, + 0, vertical, FALSE, FALSE ); SCROLL_MovingThumb = !SCROLL_MovingThumb; } @@ -496,95 +493,6 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, * * Draw the scroll bar interior (everything except the arrows). */ -static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar, - RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, - UINT flags, BOOL vertical, - BOOL top_selected, BOOL bottom_selected ) -{ - RECT r; - HPEN hSavePen; - HBRUSH hSaveBrush,hBrush; - - /* Only scrollbar controls send WM_CTLCOLORSCROLLBAR. - * The window-owned scrollbars need to call DEFWND_ControlColor - * to correctly setup default scrollbar colors - */ - if (nBar == SB_CTL) - { - hBrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSCROLLBAR, - (WPARAM)hdc,(LPARAM)hwnd); - } - else - { - hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR ); - } - - hSavePen = SelectObject( hdc, SYSCOLOR_GetPen(COLOR_WINDOWFRAME) ); - hSaveBrush = SelectObject( hdc, hBrush ); - - /* Calculate the scroll rectangle */ - r = *rect; - if (vertical) - { - r.top += arrowSize - SCROLL_ARROW_THUMB_OVERLAP; - r.bottom -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - } - else - { - r.left += arrowSize - SCROLL_ARROW_THUMB_OVERLAP; - r.right -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - } - - /* Draw the scroll rectangles and thumb */ - if (!thumbPos) /* No thumb to draw */ - { - PatBlt( hdc, r.left, r.top, - r.right - r.left, r.bottom - r.top, - PATCOPY ); - - /* cleanup and return */ - SelectObject( hdc, hSavePen ); - SelectObject( hdc, hSaveBrush ); - return; - } - - if (vertical) - { - PatBlt( hdc, r.left, r.top, - r.right - r.left, - thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP), - top_selected ? 0x0f0000 : PATCOPY ); - r.top += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - PatBlt( hdc, r.left, r.top + thumbSize, - r.right - r.left, - r.bottom - r.top - thumbSize, - bottom_selected ? 0x0f0000 : PATCOPY ); - r.bottom = r.top + thumbSize; - } - else /* horizontal */ - { - PatBlt( hdc, r.left, r.top, - thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP), - r.bottom - r.top, - top_selected ? 0x0f0000 : PATCOPY ); - r.left += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - PatBlt( hdc, r.left + thumbSize, r.top, - r.right - r.left - thumbSize, - r.bottom - r.top, - bottom_selected ? 0x0f0000 : PATCOPY ); - r.right = r.left + thumbSize; - } - - /* Draw the thumb */ - DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT | BF_MIDDLE ); - - /* cleanup */ - SelectObject( hdc, hSavePen ); - SelectObject( hdc, hSaveBrush ); -} - - static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, INT thumbSize, INT thumbPos, -- 2.30.2

1 0

[PATCH 1/5] user32: Avoid unnecessary scroll bar drawing.
by Zhiyi Zhang 05 Jul '21

05 Jul '21

These drawing operations are either overwritten by other drawing functions later or not needed at all. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/scroll.c | 48 ++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a63039262c7..ba8fe7966ec 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -594,12 +594,6 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT r; HPEN hSavePen; HBRUSH hSaveBrush,hBrush; - BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb; - - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, rect, vertical, arrowSize, thumbSize ); /* Select the correct brush and pen */ @@ -672,11 +666,6 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, Rectangle( hdc, r.left+1, r.top+1, r.right-1, r.bottom-1 ); DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT ); - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, rect, vertical, arrowSize, thumbSize ); - /* cleanup */ SelectObject( hdc, hSavePen ); SelectObject( hdc, hSaveBrush ); @@ -695,7 +684,6 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, RECT rect; BOOL vertical; SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ); - BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); if (!(hwnd = WIN_GetFullHandle( hwnd ))) return; @@ -711,11 +699,6 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, /* do not draw if the scrollbar rectangle is empty */ if(IsRectEmpty(&rect)) return; - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); - /* Draw the arrows */ if (arrows && arrowSize) @@ -728,14 +711,19 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, FALSE, FALSE ); } - if( interior ) - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, FALSE, FALSE ); - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + if (interior) + { + if (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) + { + SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + } + else + { + SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, + infoPtr->flags, vertical, FALSE, FALSE ); + } + } /* if scroll bar has focus, reposition the caret */ if(hwnd==GetFocus() && (nBar==SB_CTL)) @@ -975,9 +963,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } else if (msg == WM_LBUTTONUP) { - if (SCROLL_MovingThumb) - SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, infoPtr->flags, vertical, FALSE, FALSE ); @@ -994,9 +979,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } if ( (pos != lastMousePos) || (!SCROLL_MovingThumb) ) { - if (SCROLL_MovingThumb) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, - arrowSize, thumbSize ); lastMousePos = pos; SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos; SCROLL_TrackingVal = SCROLL_GetThumbVal( infoPtr, &rect, @@ -1005,9 +987,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), (LPARAM)hwndCtl ); - if (!SCROLL_MovingThumb) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, - arrowSize, thumbSize ); + SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + SCROLL_MovingThumb = TRUE; } } break; @@ -1077,6 +1058,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) /* Terminate tracking */ SCROLL_TrackingWin = 0; + SCROLL_MovingThumb = FALSE; } ReleaseDC( hwnd, hdc ); -- 2.30.2

1 0

d3d10core:d3d10core fails systematically on cw-rx460
by Francois Gouget 05 Jul '21

05 Jul '21

>From bug https://bugs.winehq.org//show_bug.cgi?id=51181 test_instanced_draw() fails systematically on cw-rx460: https://test.winehq.org/data/patterns.html#d3d10core:d3d10core d3d10core.c:9275: Test failed: Got 0xfff0f010, expected 0xff80f010 at (160, 0), sub-resource 0. d3d10core.c:9275: Test failed: Got 0xfff0f040, expected 0xff80f040 at (240, 0), sub-resource 0. d3d10core.c:9275: Test failed: Got 0xffaaaacc, expected 0xffbbaacc at (480, 0), sub-resource 0. d3d10core.c:9275: Test failed: Got 0xffaaaa90, expected 0xffbbaa90 at (560, 0), sub-resource 0. It turns out that this happens when running test_il_append_aligned() and test_instanced_draw() in parallel. So would it be acceptable to run test_instanced_draw() after the other tests as in the patch below or should this be investigated some more? https://bugs.winehq.org//attachment.cgi?id=70210 -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

What to do for the d3d11:d3d11 crash on cw-gtx560?
by Francois Gouget 05 Jul '21

05 Jul '21

>From bug https://bugs.winehq.org//show_bug.cgi?id=51103 The commit adding more SwapDeviceContextState() tests (ccffc06c6df3) is causing d3d11:d3d11 to crash on the GTX 560 Nvidia card: https://test.winehq.org/data/patterns.html#d3d11:d3d11 It turns out that the crash is happening in the final ID3D11Device1_Release(device) call in test_device_context_state(). So that's probably a reference counting bug in the Nvidia driver but it still happens on the latest driver for that GeForce GTX 560 card : 391.35. So what should we do? Drop the final ID3D11Device1_Release(device) call? Drop the extra tests? Something else? -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

[PATCH 1/4] winex11.drv: Only return vulkan functions if the host function is available.
by Georg Lehmann 05 Jul '21

05 Jul '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winex11.drv/vulkan.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index bdc287afeea..1bbdba2ce1d 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -435,12 +435,25 @@ static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, return pvkGetDeviceGroupSurfacePresentModesKHR(device, x11_surface->surface, flags); } +static const char *wine_vk_native_fn_name(const char *name) +{ + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return "vkCreateXlibSurfaceKHR"; + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return "vkGetPhysicalDeviceXlibPresentationSupportKHR"; + + return name; +} + static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -453,6 +466,9 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr; -- 2.32.0

2 5

[WineHQ] wwn/en: Tweak the wording of the AppDB disclaimer.
by Francois Gouget 05 Jul '21

05 Jul '21

--- wwn/en/wn20071210_334.xml | 10 +++++----- wwn/en/wn20071217_335.xml | 13 ++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/wwn/en/wn20071210_334.xml b/wwn/en/wn20071210_334.xml index 1919feb7..2c19f405 100644 --- a/wwn/en/wn20071210_334.xml +++ b/wwn/en/wn20071210_334.xml @@ -530,12 +530,12 @@ situation left where shaders recompile all over. posts="0" > <topic>AppDB</topic> -*Disclaimer: This list of changes is automatically generated by +*Disclaimer: This list of changes is automatically generated from information entered into the AppDB. These results are subject to the opinions -of the users submitting application reviews. The WINE community does not -guarantee that even though an application may be upgraded to 'Gold' or -'Platinum' in this list that you will have the same experience and would -provide a similar rating +of the users submitting application reviews. Even if an application is +upgraded to 'Gold' or 'Platinum' in this list, the Wine community cannot +guarantee that you will have the same experience and would +provide a similar rating. <div align="center"> Updates by App Maintainers <table width="80%" border="1" bordercolor="#222222" cellspacing="0" cellpadding="3"> diff --git a/wwn/en/wn20071217_335.xml b/wwn/en/wn20071217_335.xml index 9a550817..0cdc1079 100644 --- a/wwn/en/wn20071217_335.xml +++ b/wwn/en/wn20071217_335.xml @@ -379,13 +379,12 @@ Alexander N. Sornes posts="0" > <topic>AppDB</topic> -*Disclaimer: This list of changes is automatically generated by -information entered into the AppDB. -These results are subject to the opinions of the users submitting application -reviews. -The WINE community does not guarantee that even though an application may be -upgraded to 'Gold' or 'Platinum' in this list that you -will have the same experience and would provide a similar rating +*Disclaimer: This list of changes is automatically generated from +information entered into the AppDB. These results are subject to the opinions +of the users submitting application reviews. Even if an application is +upgraded to 'Gold' or 'Platinum' in this list, the Wine community cannot +guarantee that you will have the same experience and would +provide a similar rating. <div align="center"> Updates by App Maintainers <table width="80%" border="1" bordercolor="#222222" cellspacing="0" cellpadding="3"> -- 2.20.1

1 0

[WineHQ] wwn/en: Fix some case and spelling issues, add some missing words.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- wwn/en/wn19990829_6.xml | 2 +- wwn/en/wn20010611_97.xml | 6 +++--- wwn/en/wn20010802_101.xml | 10 +++++----- wwn/en/wn20041015_244.xml | 4 ++-- wwn/en/wn20070410_328.xml | 2 +- wwn/en/wn20080106_338.xml | 4 ++-- wwn/en/wn20080922_352.xml | 2 +- wwn/en/wn20140303_364.xml | 12 ++++++------ wwn/en/wn20140314_365.xml | 8 ++++---- wwn/en/wn20140328_366.xml | 8 ++++---- wwn/en/wn20140509_369.xml | 4 ++-- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/wwn/en/wn19990829_6.xml b/wwn/en/wn19990829_6.xml index 374c6529..ed2f737b 100644 --- a/wwn/en/wn19990829_6.xml +++ b/wwn/en/wn19990829_6.xml @@ -15,7 +15,7 @@ main goal is to distribute widely what's going on around Wine (the Un*x Windows emulator). Well this week has been very quiet on wine-devel, as if most of the -developpers were on vacation at the same time. Of course, there was the +developers were on vacation at the same time. Of course, there was the O'Reilly conference in Monterey (CA) where Alexandre Julliard was giving a talk. So, I barely had enough material to put an issue together. diff --git a/wwn/en/wn20010611_97.xml b/wwn/en/wn20010611_97.xml index 8a0ddfd3..10b708e5 100644 --- a/wwn/en/wn20010611_97.xml +++ b/wwn/en/wn20010611_97.xml @@ -308,7 +308,7 @@ a 2GB virtual memory space this means you can start a maximum of about 2000 threads. If you increase this to 10MB then you can only start 200 threads (per process). - And that's why you have all the Java developpers complaining that + And that's why you have all the Java developers complaining that Java does not scale because it only support 2000 clients! Let me explain. Until JDK1.4 is out Java does not have asynchronous I/O. So all Java servers are of the 'one thread per client' type. So they all block @@ -320,9 +320,9 @@ very much this affects your application (seems more scientific computing oriented). One more word on Java and threads :-) All (overgeneralization, I now) -Java developpers (and benchmarketers) say Linux is bad because it does +Java developers (and benchmarketers) say Linux is bad because it does not scale well when you have thousands of runnable threads. And all -kernel developpers reply 'you have to be crazy to have thousands of +kernel developers reply 'you have to be crazy to have thousands of threads, your server performance will be bad anyway if you do that' (to which I can only agree). Fortunately, as I said before, JDK 1.4 will finally have asynchronous I/O, and even memory mapped files! So maybe diff --git a/wwn/en/wn20010802_101.xml b/wwn/en/wn20010802_101.xml index 18d230cd..0b22069c 100644 --- a/wwn/en/wn20010802_101.xml +++ b/wwn/en/wn20010802_101.xml @@ -408,12 +408,12 @@ environment for which we no longer have any documentation. Then when someone comes to modify some piece of code which is shared between Win16 and Win32 you have no idea if the fix you made for Win32 is not going to break Win16. If Wine had had good independent documentation of the API -from the start developpers could refer to this documentation to know +from the start developers could refer to this documentation to know whether a change is going to break Win16 or not.</li> <li>MSDN documentation is often incomplete / slightly incorrect (though people working on Wine should maybe look at it a bit more). So what you propose is that this be *the* documentation for the Win32 API. I -think Wine developpers and Winelib users deserve better. And no one +think Wine developers and Winelib users deserve better. And no one using Winelib as a development platform would want to have to go to two places to find documentation.</li> <li>The MSDN documentation is currently freely available on the Web. @@ -429,14 +429,14 @@ this is the only place where they have a remote chance of staying up to date (and also where it's most practical to have it). - Of course developpers are very well-known for hating to document + Of course developers are very well-known for hating to document stuff so it's going to be pretty hard to get proper documentation. But -we should encourage all Wine developpers to write good documentation for +we should encourage all Wine developers to write good documentation for the functions they implement/fix, not dissuade them to do so. Also I agree with you that the strict minimum is to at least document all the undocumented/weird behaviors. Especially since without some sort -of documentation the next developper may be tempted to remove what looks +of documentation the next developer may be tempted to remove what looks like unnecessarily convoluted/obviously wrong code. diff --git a/wwn/en/wn20041015_244.xml b/wwn/en/wn20041015_244.xml index 4779b42a..78ed178d 100644 --- a/wwn/en/wn20041015_244.xml +++ b/wwn/en/wn20041015_244.xml @@ -310,7 +310,7 @@ the private header</li></ul> </section> <section title="COM Inheritance" - subject="COM inheritence" + subject="COM inheritance" archive="//www.winehq.org/hypermail/wine-devel/2004/10/0236.html" posts="4" startdate="10/11/2004" @@ -357,7 +357,7 @@ IJimVtbl Jim_Vtbl = have extern prototypes defined. Basically this is because array initialization requires constant values. - However, this would seem something which is so common - i.e. inheritence is + However, this would seem something which is so common - i.e. inheritance is used all over the place. How do people handle this? I've looked through a few places in the code and can't see how this can be done. I could 'pretend' by initializing the Vtbl as I create the com object and do some LoadLibrary diff --git a/wwn/en/wn20070410_328.xml b/wwn/en/wn20070410_328.xml index d32bc717..e461b596 100644 --- a/wwn/en/wn20070410_328.xml +++ b/wwn/en/wn20070410_328.xml @@ -134,7 +134,7 @@ installers. Dan Kegel summarized what a lot of people on wine-devel think about such projects: <quote who="Dan Kegel"> -The problem that Wine developers have with recipies +The problem that Wine developers have with recipes like the one you cite is that most of the steps in the recipe are there to work around bugs in Wine. We would prefer to fix the bugs. For instance, diff --git a/wwn/en/wn20080106_338.xml b/wwn/en/wn20080106_338.xml index 654e050b..9b2db7f1 100644 --- a/wwn/en/wn20080106_338.xml +++ b/wwn/en/wn20080106_338.xml @@ -101,7 +101,7 @@ run in Wine. Tom also highlights a new bit of wine software, <a href="http://wine-review.blogspot.com/2008/01/bordeaux-wine-configuration-manager…">Bordeaux</a>. Bordeaux is a new wine-package manager (for apps running under wine). -I havn't yet had a chance to use it, however many of the wwn's readers may +I haven't yet had a chance to use it, however many of the wwn's readers may find this interesting and useful. <quote> @@ -424,7 +424,7 @@ Roderick Colenbrander writes with an alternative to MD5 <quote> The system on windows doesn't use the md5sum (I think it has one) but it -looks for the product ID which is burried into most executables first. It +looks for the product ID which is buried into most executables first. It also checks for other things but in a hackier way. As there are a lot of different versions of a program but which all need the same override. diff --git a/wwn/en/wn20080922_352.xml b/wwn/en/wn20080922_352.xml index 4e24ad97..0bcfd323 100644 --- a/wwn/en/wn20080922_352.xml +++ b/wwn/en/wn20080922_352.xml @@ -244,7 +244,7 @@ Jeremy </quote> A bit of an editorial: -So I actually went and downloaded <a href="http://www.codeweavers.com/services/ports/chromium/">CrossOver Chromium Edition</a> and played with it for a bit. I first tried GMail, no issues. I said to myself alright, that is pretty impressive. How about a real test: will flash work? I went to youtube.com and sure enough I got the error "Flash isn't installed." Aww poop. Well, lets try installing it. Clicked the "go to Adobe to get Flash" link, downloaded the executable which ran a really fast installer. I went back to youtube.com and..... no luck. At this point I had lost a bit of hope. But then an idea struck me! I closed the browser and re-opened it. Off to youtube.com and... voila! Working flash video! I watched a rather cute video of a cat smacking a printer with its paw. After about 45 seconds of this the cat hit it hard enough that the paper tray came lose and the cat went flying. Perfect. +So I actually went and downloaded <a href="http://www.codeweavers.com/services/ports/chromium/">CrossOver Chromium Edition</a> and played with it for a bit. I first tried GMail, no issues. I said to myself alright, that is pretty impressive. How about a real test: will flash work? I went to youtube.com and sure enough I got the error "Flash isn't installed." Aww poop. Well, let's try installing it. Clicked the "go to Adobe to get Flash" link, downloaded the executable which ran a really fast installer. I went back to youtube.com and..... no luck. At this point I had lost a bit of hope. But then an idea struck me! I closed the browser and re-opened it. Off to youtube.com and... voila! Working flash video! I watched a rather cute video of a cat smacking a printer with its paw. After about 45 seconds of this the cat hit it hard enough that the paper tray came lose and the cat went flying. Perfect. As a Wine user of many years there are these occasional moments in using Wine when, after getting something seemingly outrageously complex to work, you sit back and go wow: that's really a miracle. This was one of them for me, hats off to the entire Wine and CodeWeavers team. diff --git a/wwn/en/wn20140303_364.xml b/wwn/en/wn20140303_364.xml index 48852ffe..27480757 100644 --- a/wwn/en/wn20140303_364.xml +++ b/wwn/en/wn20140303_364.xml @@ -50,13 +50,13 @@ A user asked about the state of Wine64 on OS X: Where would you find information on wine64 status for running 64 bit windows software under OSX. These days a lot of Windows programs are going 64bit to make use of -the available memory. Its becoming necessary to have this capability. +the available memory. It???s becoming necessary to have this capability. </quote> Stefan gave a good explanation: <quote> -OSX has a ABI incompatibility with Win64 - OSX overwrites a CPU register that Win64 applications expect to remain untouched. Apple can???t change the ABI because there are already 64 bit OSX apps that expect things to work that way. A potential workaround may be to run Wine inside a CPU emulator like qemu, but that is anything but easy. +OSX has an ABI incompatibility with Win64 - OSX overwrites a CPU register that Win64 applications expect to remain untouched. Apple can???t change the ABI because there are already 64 bit OSX apps that expect things to work that way. A potential workaround may be to run Wine inside a CPU emulator like qemu, but that is anything but easy. </quote> </section> @@ -88,7 +88,7 @@ Shortly after the last WWN, Marcus wrote: Wine is an accepted organization for GSoC 2014, would-be students should now discuss project ideas with us as in one week the Student application period opens. -See <a href="https://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informations and project ideas. +See <a href="https://wiki.winehq.org/SummerOfCode">our Wiki</a> for more information and project ideas. </section> @@ -121,10 +121,10 @@ For each article you buy, we donate part of our benefit to Wine HQ. This way we Major changes in 20140302 since 20130707 <ul> <li>dotnet verbs are all now fully automated in -q mode</li> -<li>comctl32ocx: add ActiveX controls</li> +<li>comctl32.ocx: add ActiveX controls</li> <li>flash: udpate to version 12</li> <li>fakechinese: add some more font aliases</li> -<li>Arbitary virtual desktop sizes are now allowed (vd=1024x768, vd=800x600, etc.)</li> +<li>Arbitrary virtual desktop sizes are now allowed (vd=1024x768, vd=800x600, etc.)</li> <li>vcrun2008: also override atl90</li> <li>mingw: new version, automated install</li> </ul> @@ -152,7 +152,7 @@ For each article you buy, we donate part of our benefit to Wine HQ. This way we </ul> -See <a href="http://winetricks.org/">winetricks.org</a> for more informations. +See <a href="http://winetricks.org/">winetricks.org</a> for more information. </section> diff --git a/wwn/en/wn20140314_365.xml b/wwn/en/wn20140314_365.xml index 3347e836..8dae88b8 100644 --- a/wwn/en/wn20140314_365.xml +++ b/wwn/en/wn20140314_365.xml @@ -45,15 +45,15 @@ See <a href="https://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informa > Valve has open sourced their DirectX to OpenGL translator named <a href="//github.com/ValveSoftware/ToGL">ToGL</a>. -The media and even some developers wondered if this is usefull for Wine. Stefan D??singer had a quick look at the code and gave an answer: +The media and even some developers wondered if this is useful for Wine. Stefan D??singer had a quick look at the code and gave an answer: <quote> No, it's not. It is *very* limited. It doesn't even have stateblock -interface declaration, and it's surface implementation is pretty much +interface declaration, and its surface implementation is pretty much nonexistent. It doesn't care about any of the corner cases that make d3d9 interesting. Note that this is not an exhaustive review of this code. It's just the -first two things I found in a 2 minute look. +first two things I found in a 2 minutes look. Those limitations make sense as design decisions for Valve's purposes, but they make this wrapper useless for anything other than a cheap compile-time abstraction layer between d3d and gl. Releasing this code @@ -70,7 +70,7 @@ though. > Jeremy White finally got annoyed enough by the remaining <a href="//test.winehq.org/data/">test failures</a> on Windows and pushed people to fix them. -This also had the fact that other developers were afraid to get shamed and also fix test failures :) +This also had the effect of making other developers afraid of getting shamed and so they too fixed test failures :) We already made good progress, but there are some strange behaviours of Windows, other hard to analyze failures and problems caused by <a href="https://wiki.winehq.org/WineTestBotVMs">the way</a> the WineTestBot works. diff --git a/wwn/en/wn20140328_366.xml b/wwn/en/wn20140328_366.xml index 05ee3923..b482ada5 100644 --- a/wwn/en/wn20140328_366.xml +++ b/wwn/en/wn20140328_366.xml @@ -43,8 +43,8 @@ See <a href="https://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informa posts="0" > -Finally i cleaned out the Recent News Queue page, either by posting the story or removing it for being outdated. -Also i tried hard to find potential news myself, but that is nothing i'm good at and steals my time i could spend coding for Wine. +Finally I cleaned out the Recent News Queue page, either by posting the story or removing it for being outdated. +Also I tried hard to find potential news myself, but that is nothing i'm good at and steals my time I could spend coding for Wine. So please, if you find something interesting and Wine related, post it <a href="https://wiki.winehq.org/RecentNewsQueue">there</a>. At best you also add some text, but meanwhile i'm also happy for simple suggestions. @@ -71,14 +71,14 @@ At the moment WineCE is based on the stable version 1.6.2 and with the new chang > <topic>CN102364433</topic> -Last week i was told about the chinese Patent CN102364433. It claims that <a href="https://wiki.winehq.org/ARM">Wine on ARM</a> was invented by five chinese people and that they want to protect that procedure. +Last week I was told about the chinese Patent CN102364433. It claims that <a href="https://wiki.winehq.org/ARM">Wine on ARM</a> was invented by five chinese people and that they want to protect that procedure. While from my point of view there are no facts in that potential Patent that should be patented, there is also a Problem with the timing. As you can see <a href="//source.winehq.org/git/wine.git/search/HEAD?pg=1;s=+ARM;st=commit">here</a>, the main commits <a href="https://wiki.winehq.org/AndreHentschel">from me</a> to support the ARM architecture in Wine were published 2010 <a href="//www.winehq.org/announce/1.3.4">(and ARM was supported with Wine 1.3.4)</a>. But that potential Patent seems to be from June 2011 and tries to describe the procedure of porting Wine to ARM using Wine 1.3.13 which clearly has ARM support. -Meanwhile i try to find a good way to do something about that potential Patent and stop the process of granting it to those liars. +Meanwhile I try to find a good way to do something about that potential Patent and stop the process of granting it to those liars. </section> diff --git a/wwn/en/wn20140509_369.xml b/wwn/en/wn20140509_369.xml index 5ea06d12..dd347366 100644 --- a/wwn/en/wn20140509_369.xml +++ b/wwn/en/wn20140509_369.xml @@ -43,7 +43,7 @@ i suggest to simply open a Forum thread, name it e.g. WWN369 and ask questions o Mostly Kai Tietz and I are currently (finally) working on MinGW-w64 targeting ARMv7. -You might ask why. Well, there are multible reasons, but i'll just cover the Wine related ones here. +You might ask why. Well, there are multiple reasons, but i'll just cover the Wine related ones here. At some point we really want to compile and run our test suite not only in Wine, but also on Windows RT. @@ -60,7 +60,7 @@ to recompile most applications and libraries and run it in Wine on ARM (or a jai While we develop it we use the triple armv7-w64-mingw32ce which is quite misleading, later it will be something like -armv7-w64-mingw. But at the moment i really don't recommend to try it out. Most things don't work, build system is not +armv7-w64-mingw. But at the moment I really don't recommend to try it out. Most things don't work, build system is not ready and so on. Still, with some effort it's possible to translate a very basic application and get a Windows RT compatible executable. </section> -- 2.20.1

1 0

[PATCH v2 1/6] ntoskrnl.exe/tests: Sync test utils with wine/test.h.
by Rémi Bernon 05 Jul '21

05 Jul '21

Adding support for thread local test data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Adapt wine/test.h code instead of copying it and including wine/test.h dlls/ntoskrnl.exe/tests/Makefile.in | 10 +- dlls/ntoskrnl.exe/tests/driver.c | 32 +-- dlls/ntoskrnl.exe/tests/driver.h | 10 +- dlls/ntoskrnl.exe/tests/driver_netio.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/tests/utils.h | 290 ++++++++++++++++++++----- 6 files changed, 258 insertions(+), 87 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 863fad30f63..85a6925138a 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,15 +1,15 @@ TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid -driver_IMPORTS = winecrt0 ntoskrnl +driver_IMPORTS = winecrt0 ntoskrnl hal driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver2_IMPORTS = winecrt0 ntoskrnl +driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver3_IMPORTS = winecrt0 ntoskrnl +driver3_IMPORTS = winecrt0 ntoskrnl hal driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_hid_IMPORTS = winecrt0 ntoskrnl hidclass +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..1fe3ec2e558 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -999,41 +999,41 @@ static void test_call_driver(DEVICE_OBJECT *device) irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); - ok(iosb.Information == 123, "got information %#x\n", iosb.Information); + ok(iosb.Information == 123, "got information %#I64x\n", (UINT64)iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &event, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), @@ -1041,8 +1041,8 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); @@ -1118,7 +1118,7 @@ static void test_cancel_irp(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 1, "CurrentLocation = %u\n", irp->CurrentLocation); irpsp = IoGetCurrentIrpStackLocation(irp); - ok(irpsp->DeviceObject == device, "DeviceObject = %u\n", irpsp->DeviceObject); + ok(irpsp->DeviceObject == device, "DeviceObject = %p\n", irpsp->DeviceObject); IoSetCancelRoutine(irp, cancel_irp); cancel_cnt = 0; @@ -1432,16 +1432,16 @@ static void check_resource_(int line, ERESOURCE *resource, ULONG exclusive_waite ULONG count; count = ExGetExclusiveWaiterCount(resource); - ok_(__FILE__, line, count == exclusive_waiters, + ok_(__FILE__, line)(count == exclusive_waiters, "expected %u exclusive waiters, got %u\n", exclusive_waiters, count); count = ExGetSharedWaiterCount(resource); - ok_(__FILE__, line, count == shared_waiters, + ok_(__FILE__, line)(count == shared_waiters, "expected %u shared waiters, got %u\n", shared_waiters, count); ret = ExIsResourceAcquiredExclusiveLite(resource); - ok_(__FILE__, line, ret == exclusive, + ok_(__FILE__, line)(ret == exclusive, "expected exclusive %u, got %u\n", exclusive, ret); count = ExIsResourceAcquiredSharedLite(resource); - ok_(__FILE__, line, count == shared_count, + ok_(__FILE__, line)(count == shared_count, "expected shared %u, got %u\n", shared_count, count); } #define check_resource(a,b,c,d,e) check_resource_(__LINE__,a,b,c,d,e) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 455695ad36b..8c41010c503 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -54,7 +54,8 @@ struct test_data int running_under_wine; int winetest_report_success; int winetest_debug; - int successes, failures, skipped, todo_successes, todo_failures; + int failures; + int todo_failures; }; struct main_test_input @@ -64,13 +65,6 @@ struct main_test_input ULONG64 *modified_value; }; -static inline char *drv_strrchr( const char *str, char ch ) -{ - char *ret = NULL; - do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); - return ret; -} - static const GUID control_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc0}}; #define SERVER_LISTEN_PORT 9374 diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ea9cfd1a4c5..4ebacc7cf14 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -141,7 +141,7 @@ static void test_wsk_get_address_info(void) { struct sockaddr_in *addr = (struct sockaddr_in *)addr_info->ai_addr; - ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %u.\n", addr_info->ai_addrlen); + ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %I64u.\n", (UINT64)addr_info->ai_addrlen); ok(addr->sin_family == AF_INET, "Got unexpected sin_family %u.\n", addr->sin_family); ok(ntohs(addr->sin_port) == 12345, "Got unexpected sin_port %u.\n", ntohs(addr->sin_port)); ok(ntohl(addr->sin_addr.s_addr) == 0x7f000001, "Got unexpected sin_addr %#x.\n", diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 71dbfe1a5e9..797421904c8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -386,6 +386,7 @@ static void cat_okfile(void) SetEndOfFile(okfile); winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + winetest_add_failures(InterlockedExchange(&test_data->todo_failures, 0)); } static ULONG64 modified_value; diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 6a0e00428a5..f73f6f938ca 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -22,25 +22,103 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winternl.h> + +#include <ddk/wdm.h> + +#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static HANDLE okfile; static LONG successes; static LONG failures; static LONG skipped; static LONG todo_successes; static LONG todo_failures; -static int todo_level, todo_do_loop; +static LONG muted_traces; +static LONG muted_skipped; +static LONG muted_todo_successes; + static int running_under_wine; static int winetest_debug; static int winetest_report_success; +/* silence todos and skips above this threshold */ +static int winetest_mute_threshold = 42; + +/* counts how many times a given line printed a message */ +static LONG line_counters[16384]; + +/* The following data must be kept track of on a per-thread basis */ +struct tls_data +{ + HANDLE thread; + const char* current_file; /* file of current check */ + int current_line; /* line of current check */ + unsigned int todo_level; /* current todo nesting level */ + int todo_do_loop; + char *str_pos; /* position in debug buffer */ + char strings[2000]; /* buffer for debug strings */ + char context[8][128]; /* data to print before messages */ + unsigned int context_count; /* number of context prefixes */ +}; + +static KSPIN_LOCK tls_data_lock; +static struct tls_data tls_data_pool[128]; +static DWORD tls_data_count; + +static inline struct tls_data *get_tls_data(void) +{ + static struct tls_data tls_overflow; + struct tls_data *data; + HANDLE thread = PsGetCurrentThreadId(); + KIRQL irql; + + KeAcquireSpinLock(&tls_data_lock, &irql); + for (data = tls_data_pool; data != tls_data_pool + tls_data_count; ++data) + if (data->thread == thread) break; + if (data == tls_data_pool + ARRAY_SIZE(tls_data_pool)) + data = &tls_overflow; + else if (data == tls_data_pool + tls_data_count) + { + data->thread = thread; + data->str_pos = data->strings; + tls_data_count++; + } + KeReleaseSpinLock(&tls_data_lock, irql); + + return data; +} + +static inline void winetest_set_location( const char* file, int line ) +{ + struct tls_data *data = get_tls_data(); + data->current_file=strrchr(file,'/'); + if (data->current_file==NULL) + data->current_file=strrchr(file,'\\'); + if (data->current_file==NULL) + data->current_file=file; + else + data->current_file++; + data->current_line=line; +} + static inline void kvprintf(const char *format, __ms_va_list ap) { - static char buffer[512]; + struct tls_data *data = get_tls_data(); IO_STATUS_BLOCK io; - int len = vsnprintf(buffer, sizeof(buffer), format, ap); - ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); + int len = vsnprintf(data->strings, sizeof(data->strings), format, ap); + ZwWriteFile(okfile, NULL, NULL, NULL, &io, data->strings, len, NULL, NULL); } +static inline void WINAPIV kprintf(const char *format, ...) __WINE_PRINTF_ATTR(1,2); static inline void WINAPIV kprintf(const char *format, ...) { __ms_va_list valist; @@ -50,6 +128,18 @@ static inline void WINAPIV kprintf(const char *format, ...) __ms_va_end(valist); } +static inline void WINAPIV winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static inline void WINAPIV winetest_printf( const char *msg, ... ) +{ + struct tls_data *data = get_tls_data(); + __ms_va_list valist; + + kprintf( "%s:%d: ", data->current_file, data->current_line ); + __ms_va_start( valist, msg ); + kvprintf( msg, valist ); + __ms_va_end( valist ); +} + static inline NTSTATUS winetest_init(void) { const struct test_data *data; @@ -61,6 +151,8 @@ static inline NTSTATUS winetest_init(void) HANDLE section; NTSTATUS ret; + KeInitializeSpinLock(&tls_data_lock); + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); @@ -98,7 +190,7 @@ static inline void winetest_cleanup(void) if (winetest_debug) { kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, + (DWORD)(DWORD_PTR)PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); } @@ -114,10 +206,7 @@ static inline void winetest_cleanup(void) { data = addr; - InterlockedExchangeAdd(&data->successes, successes); InterlockedExchangeAdd(&data->failures, failures); - InterlockedExchangeAdd(&data->skipped, skipped); - InterlockedExchangeAdd(&data->todo_successes, todo_successes); InterlockedExchangeAdd(&data->todo_failures, todo_failures); ZwUnmapViewOfSection(NtCurrentProcess(), addr); @@ -128,118 +217,185 @@ static inline void winetest_cleanup(void) ZwClose(okfile); } -static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) +static inline void winetest_print_context( const char *msgtype ) { - const char *current_file; + struct tls_data *data = get_tls_data(); + unsigned int i; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; + winetest_printf( "%s", msgtype ); + for (i = 0; i < data->context_count; ++i) + kprintf( "%s: ", data->context[i] ); +} + +static inline LONG winetest_add_line( void ) +{ + struct tls_data *data; + int index, count; + + if (winetest_debug > 1) + return 0; + + data = get_tls_data(); + index = data->current_line % ARRAY_SIZE(line_counters); + count = InterlockedIncrement(line_counters + index) - 1; + if (count == winetest_mute_threshold) + winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); - if (todo_level) + return count; +} + +static inline int winetest_vok( int condition, const char *msg, __ms_va_list args ) +{ + struct tls_data *data = get_tls_data(); + + if (data->todo_level) { if (condition) { - kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); + winetest_print_context( "Test succeeded inside todo block: " ); kvprintf(msg, args); InterlockedIncrement(&todo_failures); + return 0; } else { - if (winetest_debug > 0) + if (!winetest_debug || + winetest_add_line() < winetest_mute_threshold) { - kprintf("%s:%d: Test marked todo: ", current_file, line); - kvprintf(msg, args); + if (winetest_debug > 0) + { + winetest_print_context( "Test marked todo: " ); + kvprintf(msg, args); + } + InterlockedIncrement(&todo_successes); } - InterlockedIncrement(&todo_successes); + else + InterlockedIncrement(&muted_todo_successes); + return 1; } } else { if (!condition) { - kprintf("%s:%d: Test failed: ", current_file, line); + winetest_print_context( "Test failed: " ); kvprintf(msg, args); InterlockedIncrement(&failures); + return 0; } else { if (winetest_report_success) - kprintf("%s:%d: Test succeeded\n", current_file, line); + winetest_printf("Test succeeded\n"); InterlockedIncrement(&successes); + return 1; } } } -static inline void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +static inline void WINAPIV winetest_ok( int condition, const char *msg, ... ) __WINE_PRINTF_ATTR(2,3); +static inline void WINAPIV winetest_ok( int condition, const char *msg, ... ) { __ms_va_list args; __ms_va_start(args, msg); - vok_(file, line, condition, msg, args); + winetest_vok(condition, msg, args); __ms_va_end(args); } -static inline void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +static inline void winetest_vskip( const char *msg, __ms_va_list args ) { - const char *current_file; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "Tests skipped: " ); + kvprintf(msg, args); + InterlockedIncrement(&skipped); + } else - current_file++; + InterlockedIncrement(&muted_skipped); +} - kprintf("%s:%d: Tests skipped: ", current_file, line); - kvprintf(msg, args); - skipped++; +static inline void WINAPIV winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static inline void WINAPIV winetest_skip( const char *msg, ... ) +{ + __ms_va_list args; + __ms_va_start(args, msg); + winetest_vskip(msg, args); + __ms_va_end(args); } -static inline void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +static inline void WINAPIV winetest_win_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { __ms_va_list args; __ms_va_start(args, msg); if (running_under_wine) - vok_(file, line, 0, msg, args); + winetest_vskip(msg, args); else - vskip_(file, line, msg, args); + winetest_vok(0, msg, args); __ms_va_end(args); } -static inline void WINAPIV trace_(const char *file, int line, const char *msg, ...) +static inline void WINAPIV winetest_trace( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static inline void WINAPIV winetest_trace( const char *msg, ... ) { - const char *current_file; __ms_va_list args; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; + if (!winetest_debug) + return; + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "" ); + __ms_va_start(args, msg); + kvprintf( msg, args ); + __ms_va_end(args); + } else - current_file++; - - __ms_va_start(args, msg); - kprintf("%s:%d: ", current_file, line); - kvprintf(msg, args); - __ms_va_end(args); + InterlockedIncrement(&muted_traces); } static inline void winetest_start_todo( int is_todo ) { - todo_level = (todo_level << 1) | (is_todo != 0); - todo_do_loop=1; + struct tls_data *data = get_tls_data(); + data->todo_level = (data->todo_level << 1) | (is_todo != 0); + data->todo_do_loop=1; } static inline int winetest_loop_todo(void) { - int do_loop=todo_do_loop; - todo_do_loop=0; + struct tls_data *data = get_tls_data(); + int do_loop=data->todo_do_loop; + data->todo_do_loop=0; return do_loop; } static inline void winetest_end_todo(void) { - todo_level >>= 1; + struct tls_data *data = get_tls_data(); + data->todo_level >>= 1; +} + +static inline void WINAPIV winetest_push_context( const char *fmt, ... ) __WINE_PRINTF_ATTR(1, 2); +static inline void WINAPIV winetest_push_context( const char *fmt, ... ) +{ + struct tls_data *data = get_tls_data(); + __ms_va_list valist; + + if (data->context_count < ARRAY_SIZE(data->context)) + { + __ms_va_start(valist, fmt); + vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); + __ms_va_end(valist); + data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; + } + ++data->context_count; +} + +static inline void winetest_pop_context(void) +{ + struct tls_data *data = get_tls_data(); + + if (data->context_count) + --data->context_count; } static inline int broken(int condition) @@ -247,11 +403,31 @@ static inline int broken(int condition) return !running_under_wine && condition; } -#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) +#ifdef WINETEST_NO_LINE_NUMBERS +# define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions +# define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace +# define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process +#else +# define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ignore_exceptions +# define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +# define wait_child_process_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_wait_child_process +#endif + +#define ok ok_(__FILE__, __LINE__) +#define skip skip_(__FILE__, __LINE__) +#define trace trace_(__FILE__, __LINE__) +#define win_skip win_skip_(__FILE__, __LINE__) + #define todo_if(is_todo) for (winetest_start_todo(is_todo); \ winetest_loop_todo(); \ winetest_end_todo()) #define todo_wine todo_if(running_under_wine) #define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) -#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_(__FILE__, __LINE__, __VA_ARGS__) -- 2.32.0

2 8

[PATCH] ntoskrnl.exe/tests: Only count test driver load notify.
by Rémi Bernon 05 Jul '21

05 Jul '21

Sometimes [1] Windows loads other drivers when we don't expect it, and this causes spurious failures. [1] https://testbot.winehq.org/JobDetails.pl?Key=93614 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 1fe3ec2e558..7ee48696c09 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -313,8 +313,7 @@ static WCHAR test_load_image_name[MAX_PATH]; static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HANDLE process_id, IMAGE_INFO *image_info) { - if (test_load_image_notify_count == -1 - || (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp"))) + if (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp")) { ++test_load_image_notify_count; test_image_info = *image_info; @@ -380,7 +379,7 @@ static void test_load_driver(void) || !wcscmp(test_load_image_name, full_name->Name.Buffer), "Expected image path name %ls, got %ls.\n", full_name->Name.Buffer, test_load_image_name); - test_load_image_notify_count = -1; + test_load_image_notify_count = 0; ret = ZwLoadDriver(&name); ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); @@ -395,7 +394,7 @@ static void test_load_driver(void) ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); ok(ret == STATUS_PROCEDURE_NOT_FOUND, "Got unexpected status %#x.\n", ret); - ok(test_load_image_notify_count == -1, "Got unexpected test_load_image_notify_count %u.\n", + ok(test_load_image_notify_count == 0, "Got unexpected test_load_image_notify_count %u.\n", test_load_image_notify_count); RtlFreeUnicodeString(&image_path); } -- 2.32.0

1 0

[PATCH 1/6] iphlpapi: Implement ConvertInterfaceIndexToLuid() on top of NSI.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/iphlpapi_main.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 3a2227f5ebb..3db17289bf4 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi -IMPORTS = advapi32 +IMPORTS = advapi32 nsi uuid EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b6b96165027..05f3c3b9b76 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -56,7 +56,9 @@ #include "netioapi.h" #include "tcpestats.h" #include "ip2string.h" +#include "netiodef.h" +#include "wine/nsi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -3183,20 +3185,16 @@ DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID *guid, NET_LUID *luid) */ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid) { - MIB_IFROW row; + DWORD err; - TRACE("(%u %p)\n", index, luid); + TRACE( "(%u %p)\n", index, luid ); if (!luid) return ERROR_INVALID_PARAMETER; - memset( luid, 0, sizeof(*luid) ); - - row.dwIndex = index; - if (GetIfEntry( &row )) return ERROR_FILE_NOT_FOUND; - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, luid, sizeof(*luid), 0 ); + if (err) luid->Value = 0; + return err; } /****************************************************************** -- 2.23.0

1 1

[PATCH vkd3d v2 1/2] tests: Add test for texture placement at 64kb alignment.
by Conor McCarthy 05 Jul '21

05 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ce6d6b36..82b1b45b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29766,6 +29766,106 @@ static void test_resource_allocation_info(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_64kb_texture_alignment(void) +{ + ID3D12GraphicsCommandList *command_list; + D3D12_RESOURCE_ALLOCATION_INFO info; + D3D12_SUBRESOURCE_DATA texture_data; + D3D12_RESOURCE_DESC resource_desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *textures[2]; + D3D12_HEAP_DESC heap_desc; + ID3D12CommandQueue *queue; + uint32_t *upload_buffer; + unsigned int i, x, y; + ID3D12Device *device; + ID3D12Heap *heap; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + /* This results in an alignment of 0x20000 with RX580/RADV, but + * only with D3D12_TEXTURE_LAYOUT_UNKNOWN. Other cards/drivers may + * specify smaller alignments compatible with the 64kb D3D12 default. */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 1024; + resource_desc.Height = 1024; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = 0; + + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &resource_desc); + + heap_desc.SizeInBytes = info.SizeInBytes * 2 + D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_DENY_BUFFERS | D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + /* Padding of info.SizeInBytes is (vulkan_alignment - d3d12_alignment), so this heap_offset calculation + * always results in a Vulkan-aligned offset which won't be adjusted upwards. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + info.SizeInBytes, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, &IID_ID3D12Resource, (void **)&textures[1]); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + /* Some apps, e.g. WoW, ignore the alignment returned by GetResourceAllocationInfo() and use + * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT. D3D12 requires support for this alignment. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, &IID_ID3D12Resource, (void **)&textures[0]); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + upload_buffer = malloc(info.SizeInBytes); + ok(upload_buffer, "Failed to allocate memory.\n"); + + for (i = 0; i < resource_desc.Width * resource_desc.Height; ++i) + upload_buffer[i] = 0xcafef00d; + texture_data.pData = upload_buffer; + texture_data.RowPitch = resource_desc.Width * sizeof(uint32_t); + texture_data.SlicePitch = texture_data.RowPitch * resource_desc.Height; + upload_texture_data(textures[1], &texture_data, 1, queue, command_list); + + for (i = 0; i < resource_desc.Width * resource_desc.Height; ++i) + upload_buffer[i] = 0xdeadbeef; + texture_data.SlicePitch = texture_data.RowPitch * resource_desc.Height; + reset_command_list(command_list, context.allocator); + /* Write data to the first texture to check if the second is overwritten. + * Resource overlap may still go undetected depending on the actual layout + * used by the driver. */ + upload_texture_data(textures[0], &texture_data, 1, queue, command_list); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, textures[1], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(textures[1], 0, &rb, queue, command_list); + for (y = 0; y < resource_desc.Height; ++y) + { + for (x = 0; x < resource_desc.Width; ++x) + { + i = get_readback_uint(&rb, x, y, 0); + ok(i == 0xcafef00d, "Expected 0xcafef00d, got %#x at %u, %u.\n", i, x, y); + } + } + release_resource_readback(&rb); + + free(upload_buffer); + ID3D12Resource_Release(textures[0]); + ID3D12Resource_Release(textures[1]); + ID3D12Heap_Release(heap); + destroy_test_context(&context); +} + static void test_suballocate_small_textures(void) { D3D12_GPU_VIRTUAL_ADDRESS gpu_address; @@ -33982,6 +34082,7 @@ START_TEST(d3d12) run_test(test_clip_distance); run_test(test_combined_clip_and_cull_distances); run_test(test_resource_allocation_info); + run_test(test_64kb_texture_alignment); run_test(test_suballocate_small_textures); run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); -- 2.31.1

2 6

[PATCH 6/6] maintainers: Add a Network Store Interface section.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1bc8658e02..e85151e9bd2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,9 +181,14 @@ F: programs/netstat/ Network P: Bruno Jesus <00cpxxx(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> -F: dlls/iphlpapi/ F: dlls/ws2_32/ +Network Store Interface +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/iphlpapi/ +F: dlls/nsi/ +F: dlls/nsiproxy.sys/ + OLE Embedding M: Huw Davies <huw(a)codeweavers.com> F: dlls/ole32/clipboard.c -- 2.23.0

1 0

[PATCH 5/6] iphlpapi/tests: Run the interface conversion tests on all interfaces.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/tests/iphlpapi.c | 341 +++++++++++++++------------------ 1 file changed, 153 insertions(+), 188 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index b6e62138256..480d6ac06c5 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -65,23 +65,12 @@ static DWORD (WINAPI *pGetExtendedUdpTable)(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CL static DWORD (WINAPI *pCreateSortedAddressPairs)(const PSOCKADDR_IN6,ULONG,const PSOCKADDR_IN6,ULONG,ULONG, PSOCKADDR_IN6_PAIR*,ULONG*); static void (WINAPI *pFreeMibTable)(void*); -static DWORD (WINAPI *pConvertInterfaceGuidToLuid)(const GUID*,NET_LUID*); -static DWORD (WINAPI *pConvertInterfaceIndexToLuid)(NET_IFINDEX,NET_LUID*); -static DWORD (WINAPI *pConvertInterfaceLuidToGuid)(const NET_LUID*,GUID*); -static DWORD (WINAPI *pConvertInterfaceLuidToIndex)(const NET_LUID*,NET_IFINDEX*); -static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_T); -static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); -static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); -static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,USHORT*,BYTE*); static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IPADDRESS_CHANGE_CALLBACK, PVOID, BOOLEAN, HANDLE *); static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE); -static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); -static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); - static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); @@ -98,18 +87,8 @@ static void loadIPHlpApi(void) pGetExtendedUdpTable = (void *)GetProcAddress(hLibrary, "GetExtendedUdpTable"); pCreateSortedAddressPairs = (void *)GetProcAddress(hLibrary, "CreateSortedAddressPairs"); pFreeMibTable = (void *)GetProcAddress(hLibrary, "FreeMibTable"); - pConvertInterfaceGuidToLuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceGuidToLuid"); - pConvertInterfaceIndexToLuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceIndexToLuid"); - pConvertInterfaceLuidToGuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToGuid"); - pConvertInterfaceLuidToIndex = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToIndex"); - pConvertInterfaceLuidToNameA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameA"); - pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); - pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); - pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pParseNetworkString = (void *)GetProcAddress(hLibrary, "ParseNetworkString"); - pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); - pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); pNotifyUnicastIpAddressChange = (void *)GetProcAddress(hLibrary, "NotifyUnicastIpAddressChange"); pCancelMibChangeNotify2 = (void *)GetProcAddress(hLibrary, "CancelMibChangeNotify2"); } @@ -1384,16 +1363,13 @@ static void test_GetAdaptersAddresses(void) aa->Ipv4Metric, aa->Ipv6Metric, wine_dbgstr_guid((GUID*) &aa->NetworkGuid), aa->ConnectionType, aa->TunnelType); - if (pConvertInterfaceLuidToGuid) - { - status = pConvertInterfaceLuidToGuid(&aa->Luid, &guid); - ok(!status, "got %u\n", status); - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], - guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], - guid.Data4[6], guid.Data4[7]); - ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); - } + status = ConvertInterfaceLuidToGuid(&aa->Luid, &guid); + ok(!status, "got %u\n", status); + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); } ok(dns_eligible_found, "Did not find any dns eligible addresses.\n"); HeapFree(GetProcessHeap(), 0, ptr); @@ -1644,204 +1620,193 @@ static DWORD get_interface_index(void) static void test_interface_identifier_conversion(void) { - DWORD ret; + DWORD ret, i; NET_LUID luid; GUID guid; SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; char nameA[IF_MAX_STRING_SIZE + 1], *name; - NET_IFINDEX index, index2; + NET_IFINDEX index; + MIB_IF_TABLE2 *table; - if (!pConvertInterfaceIndexToLuid) - { - win_skip( "ConvertInterfaceIndexToLuid not available\n" ); - return; - } - if (!(index = get_interface_index())) - { - skip( "no suitable interface found\n" ); - return; - } + ret = GetIfTable2( &table ); + ok( !ret, "got %d\n", ret ); - /* ConvertInterfaceIndexToLuid */ - ret = pConvertInterfaceIndexToLuid( 0, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + for (i = 0; i < table->NumEntries; i++) + { + MIB_IF_ROW2 *row = table->Table + i; - memset( &luid, 0xff, sizeof(luid) ); - ret = pConvertInterfaceIndexToLuid( 0, &luid ); - ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); - ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); - - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceIndexToLuid( index, &luid ); - ok( !ret, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); - - /* ConvertInterfaceLuidToIndex */ - ret = pConvertInterfaceLuidToIndex( NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + /* ConvertInterfaceIndexToLuid */ + ret = ConvertInterfaceIndexToLuid( 0, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceLuidToIndex( NULL, &index ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + memset( &luid, 0xff, sizeof(luid) ); + ret = ConvertInterfaceIndexToLuid( 0, &luid ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); - ret = pConvertInterfaceLuidToIndex( &luid, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceIndexToLuid( row->InterfaceIndex, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); - ret = pConvertInterfaceLuidToIndex( &luid, &index ); - ok( !ret, "got %u\n", ret ); + /* ConvertInterfaceLuidToIndex */ + ret = ConvertInterfaceLuidToIndex( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - /* ConvertInterfaceLuidToGuid */ - ret = pConvertInterfaceLuidToGuid( NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceLuidToIndex( NULL, &index ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &guid, 0xff, sizeof(guid) ); - ret = pConvertInterfaceLuidToGuid( NULL, &guid ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ok( guid.Data1 == 0xffffffff, "got %x\n", guid.Data1 ); + ret = ConvertInterfaceLuidToIndex( &luid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceLuidToGuid( &luid, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceLuidToIndex( &luid, &index ); + ok( !ret, "got %u\n", ret ); + ok( index == row->InterfaceIndex, "mismatch\n" ); - memset( &guid, 0, sizeof(guid) ); - ret = pConvertInterfaceLuidToGuid( &luid, &guid ); - ok( !ret, "got %u\n", ret ); - ok( guid.Data1, "got %x\n", guid.Data1 ); + /* ConvertInterfaceLuidToGuid */ + ret = ConvertInterfaceLuidToGuid( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - /* ConvertInterfaceGuidToLuid */ - ret = pConvertInterfaceGuidToLuid( NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + memset( &guid, 0xff, sizeof(guid) ); + ret = ConvertInterfaceLuidToGuid( NULL, &guid ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( guid.Data1 == 0xffffffff, "got %x\n", guid.Data1 ); - luid.Info.NetLuidIndex = 1; - ret = pConvertInterfaceGuidToLuid( NULL, &luid ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ok( luid.Info.NetLuidIndex == 1, "got %u\n", luid.Info.NetLuidIndex ); + ret = ConvertInterfaceLuidToGuid( &luid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceGuidToLuid( &guid, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + memset( &guid, 0, sizeof(guid) ); + ret = ConvertInterfaceLuidToGuid( &luid, &guid ); + ok( !ret, "got %u\n", ret ); + ok( IsEqualGUID( &guid, &row->InterfaceGuid ), "mismatch\n" ); - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceGuidToLuid( &guid, &luid ); - ok( !ret, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + /* ConvertInterfaceGuidToLuid */ + ret = ConvertInterfaceGuidToLuid( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - /* ConvertInterfaceLuidToNameW */ - ret = pConvertInterfaceLuidToNameW( NULL, NULL, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + luid.Info.NetLuidIndex = 1; + ret = ConvertInterfaceGuidToLuid( NULL, &luid ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( luid.Info.NetLuidIndex == 1, "got %u\n", luid.Info.NetLuidIndex ); - ret = pConvertInterfaceLuidToNameW( &luid, NULL, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceGuidToLuid( &guid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceLuidToNameW( NULL, nameW, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceGuidToLuid( &guid, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value || + broken( luid.Value != row->InterfaceLuid.Value), /* Win8 can have identical guids for two different ifaces */ + "mismatch\n" ); + if (luid.Value != row->InterfaceLuid.Value) continue; - ret = pConvertInterfaceLuidToNameW( &luid, nameW, 0 ); - ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + /* ConvertInterfaceLuidToNameW */ + ret = ConvertInterfaceLuidToNameW( NULL, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - nameW[0] = 0; - len = ARRAY_SIZE(nameW); - ret = pConvertInterfaceLuidToNameW( &luid, nameW, len ); - ok( !ret, "got %u\n", ret ); - ok( nameW[0], "name not set\n" ); + ret = ConvertInterfaceLuidToNameW( &luid, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - /* ConvertInterfaceLuidToNameA */ - ret = pConvertInterfaceLuidToNameA( NULL, NULL, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceLuidToNameW( NULL, nameW, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceLuidToNameA( &luid, NULL, 0 ); - ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + ret = ConvertInterfaceLuidToNameW( &luid, nameW, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); - ret = pConvertInterfaceLuidToNameA( NULL, nameA, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + nameW[0] = 0; + len = ARRAY_SIZE(nameW); + ret = ConvertInterfaceLuidToNameW( &luid, nameW, len ); + ok( !ret, "got %u\n", ret ); + ok( nameW[0], "name not set\n" ); - ret = pConvertInterfaceLuidToNameA( &luid, nameA, 0 ); - ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + /* ConvertInterfaceLuidToNameA */ + ret = ConvertInterfaceLuidToNameA( NULL, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - nameA[0] = 0; - len = ARRAY_SIZE(nameA); - ret = pConvertInterfaceLuidToNameA( &luid, nameA, len ); - ok( !ret, "got %u\n", ret ); - ok( nameA[0], "name not set\n" ); + ret = ConvertInterfaceLuidToNameA( &luid, NULL, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); - /* ConvertInterfaceNameToLuidW */ - ret = pConvertInterfaceNameToLuidW( NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceLuidToNameA( NULL, nameA, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceNameToLuidW( NULL, &luid ); - ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); + ret = ConvertInterfaceLuidToNameA( &luid, nameA, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); - ret = pConvertInterfaceNameToLuidW( nameW, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + nameA[0] = 0; + len = ARRAY_SIZE(nameA); + ret = ConvertInterfaceLuidToNameA( &luid, nameA, len ); + ok( !ret, "got %u\n", ret ); + ok( nameA[0], "name not set\n" ); - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceNameToLuidW( nameW, &luid ); - ok( !ret, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); - - /* ConvertInterfaceNameToLuidA */ - ret = pConvertInterfaceNameToLuidA( NULL, NULL ); - ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceNameToLuidA( NULL, &luid ); - ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - ok( luid.Info.Reserved == 0xdead, "reserved set\n" ); - ok( luid.Info.NetLuidIndex == 0xdead, "index set\n" ); - ok( luid.Info.IfType == 0xdead, "type set\n" ); - - ret = pConvertInterfaceNameToLuidA( nameA, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + /* ConvertInterfaceNameToLuidW */ + ret = ConvertInterfaceNameToLuidW( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceNameToLuidA( nameA, &luid ); - ok( !ret, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceNameToLuidW( NULL, &luid ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); - if (!pif_nametoindex || !pif_indextoname) - { - skip("if_nametoindex/if_indextoname not supported\n"); - return; - } + ret = ConvertInterfaceNameToLuidW( nameW, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - index2 = pif_nametoindex( NULL ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( nameA ); - ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); - /* Wargaming.net Game Center passes a GUID-like string. */ - index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); - ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceNameToLuidW( nameW, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); - name = pif_indextoname( 0, NULL ); - ok( name == NULL, "got %s\n", name ); + /* ConvertInterfaceNameToLuidA */ + ret = ConvertInterfaceNameToLuidA( NULL, NULL ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - name = pif_indextoname( 0, nameA ); - ok( name == NULL, "got %p\n", name ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceNameToLuidA( NULL, &luid ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); + ok( luid.Info.Reserved == 0xdead, "reserved set\n" ); + ok( luid.Info.NetLuidIndex == 0xdead, "index set\n" ); + ok( luid.Info.IfType == 0xdead, "type set\n" ); - name = pif_indextoname( ~0u, nameA ); - ok( name == NULL, "got %p\n", name ); + ret = ConvertInterfaceNameToLuidA( nameA, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - nameA[0] = 0; - name = pif_indextoname( 1, nameA ); - if (name != NULL) - { - ok( name[0], "empty name\n" ); - ok( name == nameA, "got %p\n", name ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceNameToLuidA( nameA, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); + + index = if_nametoindex( NULL ); + ok( !index, "Got unexpected index %u\n", index ); + index = if_nametoindex( nameA ); + ok( index == row->InterfaceIndex, "Got index %u for %s, expected %u\n", index, nameA, row->InterfaceIndex ); + /* Wargaming.net Game Center passes a GUID-like string. */ + index = if_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); + ok( !index, "Got unexpected index %u\n", index ); + index = if_nametoindex( wine_dbgstr_guid( &guid ) ); + ok( !index, "Got unexpected index %u for input %s\n", index, wine_dbgstr_guid( &guid ) ); + + name = if_indextoname( 0, NULL ); + ok( name == NULL, "got %s\n", name ); + + name = if_indextoname( 0, nameA ); + ok( name == NULL, "got %p\n", name ); + + name = if_indextoname( ~0u, nameA ); + ok( name == NULL, "got %p\n", name ); + + nameA[0] = 0; + name = if_indextoname( 1, nameA ); + if (name != NULL) + { + ok( name[0], "empty name\n" ); + ok( name == nameA, "got %p\n", name ); + } } + FreeMibTable( table ); } static void test_GetIfEntry2(void) -- 2.23.0

1 0

[PATCH 4/6] iphlpapi: Implement ConvertInterfaceLuidToGuid() on top of NSI.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ee5718e5d26..403b51391af 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3213,20 +3213,17 @@ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid) */ DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) { - DWORD ret; - MIB_IFROW row; + DWORD err; - TRACE("(%p %p)\n", luid, guid); + TRACE( "(%p %p)\n", luid, guid ); if (!luid || !guid) return ERROR_INVALID_PARAMETER; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - memset( guid, 0, sizeof(*guid) ); - guid->Data1 = luid->Info.NetLuidIndex; - memcpy( guid->Data4+2, "NetDev", 6 ); - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid, sizeof(*luid), + NSI_PARAM_TYPE_STATIC, guid, sizeof(*guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + if (err) memset( guid, 0, sizeof(*guid) ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH 3/6] iphlpapi: Implement ConvertInterfaceGuidToLuid() on top of NSI.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d3ee86da0b..ee5718e5d26 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3164,20 +3164,31 @@ ULONG WINAPI GetTcp6Table2(PMIB_TCP6TABLE2 table, PULONG size, BOOL order) */ DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID *guid, NET_LUID *luid) { - DWORD ret; - MIB_IFROW row; + struct nsi_ndis_ifinfo_static *data; + DWORD err, count, i; + NET_LUID *keys; - TRACE("(%s %p)\n", debugstr_guid(guid), luid); + TRACE( "(%s %p)\n", debugstr_guid(guid), luid ); if (!guid || !luid) return ERROR_INVALID_PARAMETER; + luid->Value = 0; - row.dwIndex = guid->Data1; - if ((ret = GetIfEntry( &row ))) return ret; + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), + NULL, 0, NULL, 0, (void **)&data, sizeof(*data), &count, 0 ); + if (err) return err; - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = guid->Data1; - luid->Info.IfType = row.dwType; - return NO_ERROR; + err = ERROR_INVALID_PARAMETER; + for (i = 0; i < count; i++) + { + if (IsEqualGUID( &data[i].if_guid, guid )) + { + luid->Value = keys[i].Value; + err = ERROR_SUCCESS; + break; + } + } + NsiFreeTable( keys, NULL, NULL, data ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH 2/6] iphlpapi: Implement ConvertInterfaceLuidToIndex() on top of NSI.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 05f3c3b9b76..4d3ee86da0b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,18 +3223,17 @@ DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) */ DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID *luid, NET_IFINDEX *index) { - DWORD ret; - MIB_IFROW row; + DWORD err; - TRACE("(%p %p)\n", luid, index); + TRACE( "(%p %p)\n", luid, index ); if (!luid || !index) return ERROR_INVALID_PARAMETER; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - *index = luid->Info.NetLuidIndex; - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid, sizeof(*luid), + NSI_PARAM_TYPE_STATIC, index, sizeof(*index), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index) ); + if (err) *index = 0; + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH] nsiproxy: Include netinet/in.h before if_ether.h
by Gerald Pfeifer 05 Jul '21

05 Jul '21

Recent changes to introduce dlls/nsiproxy.sys broke the build on FreeBSD. netinet/if_ether.h uses types that explicitly require netinet/in.h to be pulled in before, unlike Linux where such includes happen implicitly. This simple fix restores the build and should not impact other platforms - we already have been using this pattern elsewhere. Huw, would it make sense for you to be listed in the MAINTAINERS file? Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/ndis.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 647fd650cd3..7a0e7ec6f6c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -38,6 +38,10 @@ #include <net/if_arp.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif -- 2.31.1

2 1

[PATCH 1/2] user32: Allow the backends to defer restoring minimized windows.
by Arkadiusz Hiler 04 Jul '21

04 Jul '21

When restoring a minimized window the WM_SYSCOMMAND SC_RESTORE message should arrive after WM_NCACTIVATE but before WM_ACTIVATE and WM_SETFOCUS. Some games depend on that ordering and the related window state. For example Project CARS 3 expects window to be both active and in the foreground (wrt GetActiveWindow() and GetForegroundWindow()) when receiving those messages. Without being active the window doesn't restore properly, see 82c6ec3a32f4 ("winex11.drv: Activate window when restoring from iconic state.") But if the activate messages arrive before the window is in the foreground, the game tries to re-acquire DirectInput DISCL_FOREGROUND devices too early and fails, which results in non-working keyboards and controllers. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/user32/focus.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 4c18238a98b..e804720c7ca 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -148,6 +148,13 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); + + if (GetPropW( hwnd, L"__WINE_RESTORE_WINDOW" )) + { + SetPropW( hwnd, L"__WINE_RESTORE_WINDOW", NULL ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + } + SendMessageW( hwnd, WM_ACTIVATE, MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, IsIconic(hwnd) ), (LPARAM)previous ); -- 2.32.0

3 5

[PATCH] Implement CNG_RSA_PUBLIC_KEY_BLOB encoding/decoding
by Aaron Hill 04 Jul '21

04 Jul '21

Add support for the OID CNG_RSA_PUBLIC_KEY_BLOB to CryptEncodeObjectEx and CryptDecodeObjectEx. This OID decodes to / encodes from memory consisting of a BCRYPT_RSAKEY_BLOB, followed in memory by the exponent and modulus. This allows the Visual Studio 2019 web installer to progress further - it now reachs the stubbed NCryptOpenStorageProvider function. To aid in debugging similar issues, CryptEncodeObjectEx and CryptDecodeObjectEX now print a FIXME when encountering an unknown OID/struct type, instead of silently returning an error. Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> --- dlls/crypt32/decode.c | 103 +++++++++++++++++++++++++++++++----- dlls/crypt32/encode.c | 50 +++++++++++++++++ dlls/crypt32/tests/encode.c | 100 ++++++++++++++++++++++++++++++++++ include/wincrypt.h | 1 + 4 files changed, 242 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a0e78d62b4d..9f1949edf15 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3870,7 +3870,31 @@ struct DECODED_RSA_PUB_KEY CRYPT_INTEGER_BLOB modulus; }; -static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, +/* Helper function to decode an ASN.1 DER encoded RSA public key, writing the decoded + * key into 'decodedKey', and the length into 'size'. The memory + * for 'decodedKey' is allocated with 'CRYPT_DECODE_ALLOC_FLAG' + */ +static BOOL CRYPT_raw_decode_rsa_pub_key(struct DECODED_RSA_PUB_KEY **decodedKey, + DWORD *size, const BYTE *pbEncoded, DWORD cbEncoded) +{ + BOOL ret; + + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, modulus), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PUB_KEY, modulus.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, pubexp), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, decodedKey, + size, NULL, NULL); + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey_Bcrypt(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { @@ -3878,20 +3902,69 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, __TRY { - struct AsnDecodeSequenceItem items[] = { - { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, modulus), - CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), - FALSE, TRUE, offsetof(struct DECODED_RSA_PUB_KEY, modulus.pbData), - 0 }, - { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, pubexp), - CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, - }; struct DECODED_RSA_PUB_KEY *decodedKey = NULL; DWORD size = 0; - ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), - pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &decodedKey, - &size, NULL, NULL); + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); + + ret = CRYPT_raw_decode_rsa_pub_key(&decodedKey, &size, pbEncoded, cbEncoded); + if (ret) + { + /* Header, exponent, and modulus */ + DWORD bytesNeeded = sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) + + decodedKey->modulus.cbData; + + if (!pvStructInfo) + { + *pcbStructInfo = bytesNeeded; + ret = TRUE; + } + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + BCRYPT_RSAKEY_BLOB *hdr; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + hdr = pvStructInfo; + hdr->Magic = BCRYPT_RSAPUBLIC_MAGIC; + hdr->BitLength = decodedKey->modulus.cbData * 8; + hdr->cbPublicExp = sizeof(DWORD); + hdr->cbModulus = decodedKey->modulus.cbData; + hdr->cbPrime1 = 0; + hdr->cbPrime2 = 0; + memcpy((BYTE *)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB), + &decodedKey->pubexp, sizeof(DWORD)); + memcpy((BYTE *)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB) + + sizeof(DWORD), decodedKey->modulus.pbData, + decodedKey->modulus.cbData); + } + LocalFree(decodedKey); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + + +static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + + __TRY + { + struct DECODED_RSA_PUB_KEY *decodedKey = NULL; + DWORD size = 0; + ret = CRYPT_raw_decode_rsa_pub_key(&decodedKey, &size, pbEncoded, cbEncoded); if (ret) { DWORD bytesNeeded = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + @@ -6207,7 +6280,11 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, break; case LOWORD(X509_ECC_SIGNATURE): decodeFunc = CRYPT_AsnDecodeEccSignature; + case LOWORD(CNG_RSA_PUBLIC_KEY_BLOB): + decodeFunc = CRYPT_AsnDecodeRsaPubKey_Bcrypt; break; + default: + FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -6264,6 +6341,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeCTL; else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) decodeFunc = CRYPT_AsnDecodeObjectIdentifier; + else + FIXME("Unsupported decoder for lpszStructType %s\n", lpszStructType); return decodeFunc; } diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 02b235696ce..6d9d5737a80 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3130,6 +3130,49 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicyConstraints( return ret; } +static BOOL WINAPI CRYPT_AsnEncodeRsaPubKey_Bcrypt(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const BCRYPT_RSAKEY_BLOB *hdr = pvStructInfo; + + if (hdr->Magic != BCRYPT_RSAPUBLIC_MAGIC) + { + SetLastError(E_INVALIDARG); + ret = FALSE; + } else if (hdr->cbPublicExp != sizeof(DWORD)) { + ERR("Unexpected public exponent size %d\n", hdr->cbPublicExp); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + { + DWORD *pubexp = (DWORD*) ((BYTE*)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB)); + CRYPT_INTEGER_BLOB modulus = { hdr->cbModulus, (BYTE*)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) }; + struct AsnEncodeSequenceItem items[] = { + { &modulus, CRYPT_AsnEncodeUnsignedInteger, 0 }, + { pubexp, CRYPT_AsnEncodeInt, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; + +} + + static BOOL WINAPI CRYPT_AsnEncodeRsaPubKey(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -4563,6 +4606,11 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(CMS_SIGNER_INFO): encodeFunc = CRYPT_AsnEncodeCMSSignerInfo; break; + case LOWORD(CNG_RSA_PUBLIC_KEY_BLOB): + encodeFunc = CRYPT_AsnEncodeRsaPubKey_Bcrypt; + break; + default: + FIXME("Unimplemented encoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -4617,6 +4665,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodePolicyQualifierUserNotice; else if (!strcmp(lpszStructType, szOID_CTL)) encodeFunc = CRYPT_AsnEncodeCTL; + else + FIXME("Unsupported encodoer for lpszStructType %s\n", lpszStructType); return encodeFunc; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9597f1dfec1..80e13f48867 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2572,6 +2572,104 @@ static void test_decodeRsaPublicKey(DWORD dwEncoding) } } +static void test_encodeRsaPublicKey_Bcrypt(DWORD dwEncoding) +{ + BYTE toEncode[sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) + sizeof(modulus1)]; + BCRYPT_RSAKEY_BLOB *hdr = (BCRYPT_RSAKEY_BLOB *)toEncode; + BOOL ret; + BYTE *buf = NULL; + DWORD bufSize = 0, i; + DWORD pubexp = 65537; + + /* Try with a bogus magic value */ + hdr->Magic = 1; + hdr->BitLength = sizeof(modulus1) * 8; + hdr->cbPublicExp = sizeof(DWORD); + hdr->cbModulus = sizeof(modulus1); + hdr->cbPrime1 = 0; + hdr->cbPrime2 = 0; + memcpy(toEncode + sizeof(BCRYPT_RSAKEY_BLOB), &pubexp, sizeof(DWORD)); + memcpy(toEncode + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD), modulus1, sizeof(modulus1)); + + ret = pCryptEncodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* Finally, all valid */ + hdr->Magic = BCRYPT_RSAPUBLIC_MAGIC; + for (i = 0; i < ARRAY_SIZE(rsaPubKeys); i++) + { + hdr->BitLength = rsaPubKeys[i].modulusLen * 8; + hdr->cbModulus = rsaPubKeys[i].modulusLen; + memcpy(toEncode + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD), + rsaPubKeys[i].modulus, rsaPubKeys[i].modulusLen); + ret = pCryptEncodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(bufSize == rsaPubKeys[i].encoded[1] + 2, + "Expected size %d, got %d\n", rsaPubKeys[i].encoded[1] + 2, + bufSize); + ok(!memcmp(buf, rsaPubKeys[i].encoded, bufSize), + "Unexpected value\n"); + LocalFree(buf); + } + } +} + +static void test_decodeRsaPublicKey_Bcrypt(DWORD dwEncoding) +{ + DWORD i; + LPBYTE buf = NULL; + DWORD bufSize = 0; + BOOL ret; + + /* Try with a bad length */ + ret = pCryptDecodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + rsaPubKeys[0].encoded, rsaPubKeys[0].encoded[1], + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_MORE_INPUT /* Win9x/NT4 */), + "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", + GetLastError()); + /* Now try success cases */ + for (i = 0; i < ARRAY_SIZE(rsaPubKeys); i++) + { + bufSize = 0; + ret = pCryptDecodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + rsaPubKeys[i].encoded, rsaPubKeys[i].encoded[1] + 2, + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + BCRYPT_RSAKEY_BLOB *hdr = (BCRYPT_RSAKEY_BLOB *)buf; + DWORD *pubexp = (DWORD*)(buf + sizeof(BCRYPT_RSAKEY_BLOB)); + + ok(bufSize >= sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) + + rsaPubKeys[i].decodedModulusLen, + "Wrong size %d\n", bufSize); + ok(hdr->Magic == BCRYPT_RSAPUBLIC_MAGIC, + "Expected magic BCRYPT_RSAPUBLIC_MAGIC (%d), got %d\n", BCRYPT_RSAPUBLIC_MAGIC, + hdr->Magic); + ok(hdr->BitLength == rsaPubKeys[i].decodedModulusLen * 8, + "Wrong bit len %d\n", hdr->BitLength); + ok(hdr->cbPublicExp == sizeof(DWORD), "Expected cbPublicExp %d, got %d\n", + sizeof(DWORD), hdr->cbPublicExp); + ok(hdr->cbModulus == rsaPubKeys[i].decodedModulusLen, + "Wrong modulus len %d\n", hdr->cbModulus); + ok(hdr->cbPrime1 == 0,"Wrong cbPrime1 %d\n", hdr->cbPrime1); + ok(hdr->cbPrime2 == 0,"Wrong cbPrime2 %d\n", hdr->cbPrime2); + ok(*pubexp== 65537, "Expected pubexp 65537, got %d\n", + *pubexp); + ok(!memcmp(buf + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD), + rsaPubKeys[i].modulus, rsaPubKeys[i].decodedModulusLen), + "Unexpected modulus\n"); + LocalFree(buf); + } + } +} + static const BYTE intSequence[] = { 0x30, 0x1b, 0x02, 0x01, 0x01, 0x02, 0x01, 0x7f, 0x02, 0x02, 0x00, 0x80, 0x02, 0x02, 0x01, 0x00, 0x02, 0x01, 0x80, 0x02, 0x02, 0xff, 0x7f, 0x02, 0x04, 0xba, 0xdd, 0xf0, 0x0d }; @@ -8547,6 +8645,8 @@ START_TEST(encode) test_decodeBasicConstraints(encodings[i]); test_encodeRsaPublicKey(encodings[i]); test_decodeRsaPublicKey(encodings[i]); + test_encodeRsaPublicKey_Bcrypt(encodings[i]); + test_decodeRsaPublicKey_Bcrypt(encodings[i]); test_encodeSequenceOfAny(encodings[i]); test_decodeSequenceOfAny(encodings[i]); test_encodeExtensions(encodings[i]); diff --git a/include/wincrypt.h b/include/wincrypt.h index 28bebf8dc4b..456f2f14446 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3179,6 +3179,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define CNG_RSA_PUBLIC_KEY_BLOB ((LPCSTR)72) #define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500) #define CMS_SIGNER_INFO ((LPCSTR)501) -- 2.32.0

2 1

[PATCH] user32/tests: Fix the wording of an ok() message.
by Francois Gouget 04 Jul '21

04 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 469c193c1a3..d237e22f1fc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5272,7 +5272,7 @@ static void test_WM_DEVICECHANGE(HWND hwnd) ret = PostMessageA(hwnd, WM_DEVICECHANGE, wparams[i], 0); if (wparams[i] & 0x8000) { - ok(ret == FALSE, "PostMessage should returned %d\n", ret); + ok(ret == FALSE, "PostMessage returned %d\n", ret); ok(GetLastError() == ERROR_MESSAGE_SYNC_ONLY, "PostMessage error %08x\n", GetLastError()); } else -- 2.20.1

2 1

[PATCH 1/3] shell32/test: Fix an ok() message.
by Francois Gouget 04 Jul '21

04 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ea6f92ce827..96bfd1d94ef 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -3010,7 +3010,7 @@ static void test_PathResolve(void) ok(!lstrcmpiW(path, tests[i].expected_path), "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); } CloseHandle(file); -- 2.20.1

1 2

[PATCH] user32/tests: Use WineTest contexts to simplify test_mdi().
by Francois Gouget 04 Jul '21

04 Jul '21

This also fixes the many ok() calls that were missing context information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Such as the following failures that happen on cw-gtx560 and cw-rx460: win.c:2283: Test failed: expected !100 win.c:2283: Test failed: expected !100 --- dlls/user32/tests/win.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c1a9ba50df1..228395e0469 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2145,6 +2145,7 @@ static void test_mdi(void) SCROLLINFO si; BOOL ret, gotit; + winetest_push_context("style %#x", style[i]); mdi_client = CreateWindowExA(0, "mdiclient", NULL, WS_CHILD | style[i], 0, 0, rc.right, rc.bottom, @@ -2183,7 +2184,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2191,12 +2192,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2204,7 +2205,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); SetWindowPos(mdi_child, 0, -100, -100, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE); @@ -2213,7 +2214,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2221,12 +2222,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2234,7 +2235,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); gotit = FALSE; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) @@ -2261,7 +2262,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2270,12 +2271,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2284,11 +2285,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); DestroyMenu(child_menu); DestroyWindow(mdi_child); DestroyWindow(mdi_client); + winetest_pop_context(); } SetMenu(mdi_hwndMain, frame_menu); -- 2.20.1

1 0

[PATCH] bthprops.cpl: Add BluetoothFindNextRadio stub.
by Esdras Tarsis 03 Jul '21

03 Jul '21

For GangV Battle Royale Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 10 ++++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 26d2429c6ba..49b181763ee 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -27,7 +27,7 @@ @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stub BluetoothFindNextRadio +@ stdcall BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 60a781ef840..943c9dcb764 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -70,3 +70,13 @@ BOOL WINAPI BluetoothFindDeviceClose(HBLUETOOTH_DEVICE_FIND find) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothFindNextRadio + */ +BOOL WINAPI BluetoothFindNextRadio(HBLUETOOTH_RADIO_FIND find, HANDLE *radio) +{ + FIXME("(%p, %p): stub!\n", find, radio); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index ca24b49dd47..f2fa18aab89 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -23,7 +23,7 @@ @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stub BluetoothFindNextRadio +@ stdcall BluetoothFindNextRadio(ptr ptr) bthprops.cpl.BluetoothFindNextRadio @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose -- 2.32.0

3 2

[PATCH] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme 03 Jul '21

03 Jul '21

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. Signed-off-by: Steve Lhomme <robux4(a)ycbcr.xyz> --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2

1 1

[PATCH] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme 03 Jul '21

03 Jul '21

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. Signed-off-by: Steve Lhomme <robux4(a)ycbcr.xyz> --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2

1 0

[PATCH] include/d3d12: add interfaces to support D3D12 video decoding
by Steve Lhomme 03 Jul '21

03 Jul '21

--- include/d3d12.idl | 3 + include/d3d12video.idl | 378 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 381 insertions(+) create mode 100644 include/d3d12video.idl diff --git a/include/d3d12.idl b/include/d3d12.idl index 056e078ab9d..08ec5b9e2d3 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -1633,6 +1633,9 @@ typedef enum D3D12_COMMAND_LIST_TYPE D3D12_COMMAND_LIST_TYPE_BUNDLE = 1, D3D12_COMMAND_LIST_TYPE_COMPUTE = 2, D3D12_COMMAND_LIST_TYPE_COPY = 3, + D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE = 4, + D3D12_COMMAND_LIST_TYPE_VIDEO_PROCESS = 5, + D3D12_COMMAND_LIST_TYPE_VIDEO_ENCODE = 6 } D3D12_COMMAND_LIST_TYPE; typedef enum D3D12_COMMAND_QUEUE_PRIORITY diff --git a/include/d3d12video.idl b/include/d3d12video.idl new file mode 100644 index 00000000000..49aa8eea8d8 --- /dev/null +++ b/include/d3d12video.idl @@ -0,0 +1,378 @@ +import "d3d12.idl"; + +typedef enum D3D12_FEATURE_VIDEO +{ + D3D12_FEATURE_VIDEO_DECODE_SUPPORT = 0, + D3D12_FEATURE_VIDEO_DECODE_PROFILES = 1, + D3D12_FEATURE_VIDEO_DECODE_FORMATS = 2, + D3D12_FEATURE_VIDEO_DECODE_CONVERSION_SUPPORT = 3, + D3D12_FEATURE_VIDEO_PROCESS_SUPPORT = 5, + D3D12_FEATURE_VIDEO_PROCESS_MAX_INPUT_STREAMS = 6, + D3D12_FEATURE_VIDEO_PROCESS_REFERENCE_INFO = 7, + D3D12_FEATURE_VIDEO_DECODER_HEAP_SIZE = 8, + D3D12_FEATURE_VIDEO_PROCESSOR_SIZE = 9, + D3D12_FEATURE_VIDEO_DECODE_PROFILE_COUNT = 10, + D3D12_FEATURE_VIDEO_DECODE_FORMAT_COUNT = 11, + D3D12_FEATURE_VIDEO_ARCHITECTURE = 17, + D3D12_FEATURE_VIDEO_DECODE_HISTOGRAM = 18, + D3D12_FEATURE_VIDEO_FEATURE_AREA_SUPPORT = 19, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR = 20, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR_SIZE = 21, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_COUNT = 22, + D3D12_FEATURE_VIDEO_EXTENSION_COMMANDS = 23, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNT = 24, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_PARAMETERS = 25, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_SUPPORT = 26, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_SIZE = 27, + D3D12_FEATURE_VIDEO_DECODE_PROTECTED_RESOURCES = 28, + D3D12_FEATURE_VIDEO_PROCESS_PROTECTED_RESOURCES = 29, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCES = 30, + D3D12_FEATURE_VIDEO_DECODER_HEAP_SIZE1 = 31, + D3D12_FEATURE_VIDEO_PROCESSOR_SIZE1 = 32 +} D3D12_FEATURE_VIDEO; + +typedef enum D3D12_BITSTREAM_ENCRYPTION_TYPE +{ + D3D12_BITSTREAM_ENCRYPTION_TYPE_NONE +} D3D12_BITSTREAM_ENCRYPTION_TYPE; + +typedef enum D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE +{ + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_NONE, + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_FIELD_BASED +} D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE; + +typedef enum D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE +{ + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_OPAQUE, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_BACKGROUND, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_DESTINATION, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_SOURCE_STREAM +} D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE; + +typedef enum D3D12_VIDEO_PROCESS_FILTER_FLAGS +{ + D3D12_VIDEO_PROCESS_FILTER_FLAG_NONE, + D3D12_VIDEO_PROCESS_FILTER_FLAG_BRIGHTNESS, + D3D12_VIDEO_PROCESS_FILTER_FLAG_CONTRAST, + D3D12_VIDEO_PROCESS_FILTER_FLAG_HUE, + D3D12_VIDEO_PROCESS_FILTER_FLAG_SATURATION, + D3D12_VIDEO_PROCESS_FILTER_FLAG_NOISE_REDUCTION, + D3D12_VIDEO_PROCESS_FILTER_FLAG_EDGE_ENHANCEMENT, + D3D12_VIDEO_PROCESS_FILTER_FLAG_ANAMORPHIC_SCALING, + D3D12_VIDEO_PROCESS_FILTER_FLAG_STEREO_ADJUSTMENT +} D3D12_VIDEO_PROCESS_FILTER_FLAGS; + +typedef enum D3D12_VIDEO_FRAME_STEREO_FORMAT +{ + D3D12_VIDEO_FRAME_STEREO_FORMAT_NONE, + D3D12_VIDEO_FRAME_STEREO_FORMAT_MONO, + D3D12_VIDEO_FRAME_STEREO_FORMAT_HORIZONTAL, + D3D12_VIDEO_FRAME_STEREO_FORMAT_VERTICAL, + D3D12_VIDEO_FRAME_STEREO_FORMAT_SEPARATE +} D3D12_VIDEO_FRAME_STEREO_FORMAT; + +typedef enum D3D12_VIDEO_FIELD_TYPE +{ + D3D12_VIDEO_FIELD_TYPE_NONE, + D3D12_VIDEO_FIELD_TYPE_INTERLACED_TOP_FIELD_FIRST, + D3D12_VIDEO_FIELD_TYPE_INTERLACED_BOTTOM_FIELD_FIRST +} D3D12_VIDEO_FIELD_TYPE; + +typedef enum D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS +{ + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_NONE, + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_BOB, + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_CUSTOM +} D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_ARGUMENT_TYPE +{ + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_PICTURE_PARAMETERS, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_INVERSE_QUANTIZATION_MATRIX, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_SLICE_CONTROL, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_MAX_VALID +} D3D12_VIDEO_DECODE_ARGUMENT_TYPE; + +typedef enum D3D12_VIDEO_DECODE_SUPPORT_FLAGS +{ + D3D12_VIDEO_DECODE_SUPPORT_FLAG_NONE = 0x0, + D3D12_VIDEO_DECODE_SUPPORT_FLAG_SUPPORTED = 0x1, +} D3D12_VIDEO_DECODE_SUPPORT_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS +{ + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_NONE = 0x0, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_HEIGHT_ALIGNMENT_MULTIPLE_32_REQUIRED = 0x1, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_POST_PROCESSING_SUPPORTED = 0x2, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_REFERENCE_ONLY_ALLOCATIONS_REQUIRED = 0x4, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_ALLOW_RESOLUTION_CHANGE_ON_NON_KEY_FRAME = 0x8, +} D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_TIER +{ + D3D12_VIDEO_DECODE_TIER_NOT_SUPPORTED, + D3D12_VIDEO_DECODE_TIER_1, + D3D12_VIDEO_DECODE_TIER_2, + D3D12_VIDEO_DECODE_TIER_3, +} D3D12_VIDEO_DECODE_TIER; + + +interface ID3D12VideoDecoderHeap; + + +typedef struct D3D12_VIDEO_DECODE_CONFIGURATION +{ + GUID DecodeProfile; + D3D12_BITSTREAM_ENCRYPTION_TYPE BitstreamEncryption; + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE InterlaceType; +} D3D12_VIDEO_DECODE_CONFIGURATION; + +typedef struct D3D12_VIDEO_DECODER_DESC +{ + UINT NodeMask; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; +} D3D12_VIDEO_DECODER_DESC; + +typedef struct D3D12_VIDEO_DECODER_HEAP_DESC +{ + UINT NodeMask; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT DecodeWidth; + UINT DecodeHeight; + DXGI_FORMAT Format; + DXGI_RATIONAL FrameRate; + UINT BitRate; + UINT MaxDecodePictureBufferCount; +} D3D12_VIDEO_DECODER_HEAP_DESC; + +typedef struct D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC +{ + DXGI_FORMAT Format; + DXGI_COLOR_SPACE_TYPE ColorSpace; + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE AlphaFillMode; + UINT AlphaFillModeSourceStreamIndex; + FLOAT BackgroundColor[4]; + DXGI_RATIONAL FrameRate; + BOOL EnableStereo; +} D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC; + +typedef struct D3D12_VIDEO_SIZE_RANGE +{ + UINT MaxWidth; + UINT MaxHeight; + UINT MinWidth; + UINT MinHeight; +} D3D12_VIDEO_SIZE_RANGE; + +typedef struct D3D12_VIDEO_PROCESS_LUMA_KEY +{ + BOOL Enable; + FLOAT Lower; + FLOAT Upper; +} D3D12_VIDEO_PROCESS_LUMA_KEY; + +typedef struct D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC +{ + DXGI_FORMAT Format; + DXGI_COLOR_SPACE_TYPE ColorSpace; + DXGI_RATIONAL SourceAspectRatio; + DXGI_RATIONAL DestinationAspectRatio; + DXGI_RATIONAL FrameRate; + D3D12_VIDEO_SIZE_RANGE SourceSizeRange; + D3D12_VIDEO_SIZE_RANGE DestinationSizeRange; + BOOL EnableOrientation; + D3D12_VIDEO_PROCESS_FILTER_FLAGS FilterFlags; + D3D12_VIDEO_FRAME_STEREO_FORMAT StereoFormat; + D3D12_VIDEO_FIELD_TYPE FieldType; + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS DeinterlaceMode; + BOOL EnableAlphaBlending; + D3D12_VIDEO_PROCESS_LUMA_KEY LumaKey; + UINT NumPastFrames; + UINT NumFutureFrames; + BOOL EnableAutoProcessing; +} D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT +{ + UINT NodeIndex; + UINT ProfileCount; +} D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES +{ + UINT NodeIndex; + UINT ProfileCount; + GUID *pProfiles; +} D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT FormatCount; +} D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT FormatCount; + DXGI_FORMAT *pOutputFormats; +} D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT Width; + UINT Height; + DXGI_FORMAT DecodeFormat; + DXGI_RATIONAL FrameRate; + UINT BitRate; + D3D12_VIDEO_DECODE_SUPPORT_FLAGS SupportFlags; + D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS ConfigurationFlags; + D3D12_VIDEO_DECODE_TIER DecodeTier; +} D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT; + +typedef struct D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS +{ + BOOL Enable; + ID3D12Resource *pReferenceTexture2D; + UINT ReferenceSubresource; + DXGI_COLOR_SPACE_TYPE OutputColorSpace; + DXGI_COLOR_SPACE_TYPE DecodeColorSpace; +} D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS; + +typedef struct D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS +{ + ID3D12Resource *pOutputTexture2D; + UINT OutputSubresource; + D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS ConversionArguments; +} D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS; + +typedef struct D3D12_VIDEO_DECODE_FRAME_ARGUMENT +{ + D3D12_VIDEO_DECODE_ARGUMENT_TYPE Type; + UINT Size; + void *pData; +} D3D12_VIDEO_DECODE_FRAME_ARGUMENT; + +typedef struct D3D12_VIDEO_DECODE_REFERENCE_FRAMES +{ + UINT NumTexture2Ds; + ID3D12Resource **ppTexture2Ds; + UINT *pSubresources; + ID3D12VideoDecoderHeap **ppHeaps; +} D3D12_VIDEO_DECODE_REFERENCE_FRAMES; + +typedef struct D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM +{ + ID3D12Resource *pBuffer; + UINT64 Offset; + UINT64 Size; +} D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM; + +typedef struct D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS +{ + UINT NumFrameArguments; + D3D12_VIDEO_DECODE_FRAME_ARGUMENT FrameArguments[10]; + D3D12_VIDEO_DECODE_REFERENCE_FRAMES ReferenceFrames; + D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM CompressedBitstream; + ID3D12VideoDecoderHeap *pHeap; +} D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS; + + +[ + uuid(1F052807-0B46-4ACC-8A89-364F793718A4), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDevice : IUnknown +{ + HRESULT CheckFeatureSupport(D3D12_FEATURE_VIDEO FeatureVideo, + void *pFeatureSupportData, + UINT FeatureSupportDataSize); + + HRESULT CreateVideoDecoder(const D3D12_VIDEO_DECODER_DESC *pDesc, + REFIID riid, + void **ppVideoDecoder); + + HRESULT CreateVideoDecoderHeap(const D3D12_VIDEO_DECODER_HEAP_DESC *pVideoDecoderHeapDesc, + REFIID riid, + void **ppVideoDecoderHeap); + + HRESULT CreateVideoProcessor(UINT NodeMask, + const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC *pOutputStreamDesc, + UINT NumInputStreamDescs, + const D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *pInputStreamDescs, + REFIID riid, + void **ppVideoProcessor); +} + +[ + uuid(C59B6BDC-7720-4074-A136-17A156037470), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecoder : ID3D12Pageable +{ + D3D12_VIDEO_DECODER_DESC GetDesc(); +} + +[ + uuid(0946B7C9-EBF6-4047-BB73-8683E27DBB1F), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecoderHeap : ID3D12Pageable +{ + D3D12_VIDEO_DECODER_HEAP_DESC GetDesc(); +} + +[ + uuid(3B60536E-AD29-4E64-A269-F853837E5E53), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecodeCommandList : ID3D12CommandList +{ + HRESULT Close(); + + HRESULT Reset(ID3D12CommandAllocator *pAllocator); + + void ClearState(); + + void ResourceBarrier(UINT NumBarriers, const D3D12_RESOURCE_BARRIER *pBarriers); + + void DiscardResource(ID3D12Resource *pResource, const D3D12_DISCARD_REGION *pRegion); + + void BeginQuery(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT Index); + + void EndQuery(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT Index); + + void ResolveQueryData(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT StartIndex, + UINT NumQueries, ID3D12Resource *pDestinationBuffer, + UINT64 AlignedDestinationBufferOffset); + + void SetPredication(ID3D12Resource *pBuffer, UINT64 AlignedBufferOffset, + D3D12_PREDICATION_OP Operation); + + void SetMarker(UINT Metadata, const void *pData, UINT Size); + + void BeginEvent(UINT Metadata, const void *pData, UINT Size); + + void EndEvent(); + + void DecodeFrame(ID3D12VideoDecoder *pDecoder, + const D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS *pOutputArguments, + const D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *pInputArguments); + + void WriteBufferImmediate(UINT Count, + const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, + const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes); +} -- 2.29.2

1 2

[PATCH] msxml3: Fix crash when iterating through attributes with namespaces.
by Bernhard Übelacker 02 Jul '21

02 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50475 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- For an attribute xmlns without a :foo prefix, the function domelem_get_item gives a NULL xmlns->prefix into xmlNewNsProp, which therefore fails and leaves domelem_get_item without returning an item. Therefore the crash follows. --- dlls/msxml3/element.c | 5 ++- dlls/msxml3/tests/domdoc.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 1a523798328..c11d28b066c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1832,7 +1832,10 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode * if (!xmlns) return E_OUTOFMEMORY; - curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + if (ns->prefix) + curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + else + curr = xmlNewProp(NULL, xmlns->prefix, ns->href); if (!curr) { xmlFreeNs(xmlns); return E_OUTOFMEMORY; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df30104a156..8faf5b59be5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13628,6 +13628,67 @@ todo_wine DeleteFileA(path); } +static const char svg[] = + "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"></svg>"; + +static void test_prefixless_namespace(void) +{ + HRESULT hr; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + BSTR str; + IXMLDOMNodeList *node_list; + LONG length; + IXMLDOMNode *node1; + IXMLDOMNode *node2; + IXMLDOMNamedNodeMap *node_map; + int found; + + doc = create_document(&IID_IXMLDOMDocument); + EXPECT_REF(doc, 1); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(svg), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_childNodes(doc, &node_list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_get_item(node_list, 0, &node1); + EXPECT_HR(hr, S_OK); + + node_map = (void *)0xdeadbeef; + hr = IXMLDOMNode_get_attributes(node1, &node_map); + EXPECT_HR(hr, S_OK); + + length = 0xdeadbeef; + hr = IXMLDOMNamedNodeMap_get_length(node_map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 3, "expected length=%d, got %d\n", 3, length); + + found = 0; + for (int i = 0; i < length; i++) + { + hr = IXMLDOMNamedNodeMap_get_item(node_map, i, &node2); + EXPECT_HR(hr, S_OK); + + str = (void *)0xdeadbeef; + hr = IXMLDOMNode_get_xml(node2, &str); + EXPECT_HR(hr, S_OK); + if (lstrcmpW(str, L"version=\"1.1\"") == 0) found++; + if (lstrcmpW(str, L"xmlns=\"http://www.w3.org/2000/svg\"") == 0) found++; + if (lstrcmpW(str, L"xmlns:xlink=\"http://www.w3.org/1999/xlink\"") == 0) found++; + SysFreeString(str); + + IXMLDOMNode_Release(node2); + } + ok(found == 3, "expected to find %d elements, found %d\n", 3, found); + + IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node1); + IXMLDOMNodeList_Release(node_list); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -13723,6 +13784,7 @@ START_TEST(domdoc) test_mxnamespacemanager(); test_mxnamespacemanager_override(); } + test_prefixless_namespace(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH 1/3] wininet/tests: Test InternetCrackUrl when given a bogus length
by Tim Clem 02 Jul '21

02 Jul '21

Windows will stop processing at the first null, even when given an explicit length. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/wininet/tests/url.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index bce7dc76c59..681b6ef0b32 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -653,6 +653,15 @@ static void InternetCrackUrl_test(void) GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); ok(GLE == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "Expected GLE to represent a failure\n"); + + /* Windows treats dwUrlLength as a maximum - if there is a null before + * that length, it stops there. */ + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); + ret = InternetCrackUrlA("http://x.org", 13 /* includes the nul */, 0, &urlComponents); + ok(ret, "InternetCrackUrlA failed with error %d\n", GetLastError()); + todo_wine + ok(urlComponents.dwHostNameLength == 5, + "Expected dwHostNameLength of 5, got %d\n", urlComponents.dwHostNameLength); } static void InternetCrackUrlW_test(void) @@ -825,6 +834,19 @@ static void InternetCrackUrlW_test(void) ok(r, "InternetCrackUrlW failed unexpectedly\n"); ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n"); + + /* Windows treats dwUrlLength as a maximum - if there is a null before + * that length, it stops there. */ + host[0] = 0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszHostName = host; + comp.dwHostNameLength = ARRAY_SIZE(host); + r = InternetCrackUrlW(url3, 13 /* includes the nul */, 0, &comp); + ok(r, "InternetCrackUrlW failed with error %d\n", GetLastError()); + todo_wine + ok(comp.dwHostNameLength == 5, + "Expected dwHostNameLength of 5, got %d\n", comp.dwHostNameLength); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents) -- 2.32.0

2 7

[PATCH v2] wined3d: Pass a wined3d_device pointer to wined3d_from_cs().
by Zebediah Figura 02 Jul '21

02 Jul '21

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Remove an assertion from wined3d_cs_queue_is_empty(). dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context_gl.c | 4 ++-- dlls/wined3d/cs.c | 1 - dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 850e2a6dfdb..d5001c1296b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -541,7 +541,7 @@ static struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!device->context_count) return NULL; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 474003d7553..33cb76343cd 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2295,7 +2295,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) TRACE("Destroying context %p.\n", context_gl); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); /* We delay destroying a context when it is active. The context_release() * function invokes wined3d_context_gl_destroy() again while leaving the @@ -4229,7 +4229,7 @@ struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_g return NULL; device = context_gl->c.device; - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (context_gl->c.current_rt.texture) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ce0417c9f71..c5fc8fbb7a6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3047,7 +3047,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) { - wined3d_from_cs(cs); return *(volatile LONG *)&queue->head == queue->tail; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a2a95ebe96..55879e546f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5765,7 +5765,7 @@ void device_invalidate_state(const struct wined3d_device *device, unsigned int s unsigned int representative, i, idx, shift; struct wined3d_context *context; - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (STATE_IS_COMPUTE(state_id)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a39c6d75750..b87efaddaff 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2694,7 +2694,7 @@ static struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_devic { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!device->context_count) return NULL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 693557448fe..fe1bcb3824a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1783,7 +1783,7 @@ static struct wined3d_context_gl *wined3d_swapchain_gl_create_context(struct win TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain_gl, GetCurrentThreadId()); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80e03ad9212..36e1fa4ec7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6034,10 +6034,10 @@ static inline void wined3d_insert_bits(DWORD *bitstream, } } -static inline void wined3d_from_cs(const struct wined3d_cs *cs) +static inline void wined3d_from_cs(const struct wined3d_device *device) { - if (cs->thread) - assert(cs->thread_id == GetCurrentThreadId()); + if (device->cs->thread) + assert(device->cs->thread_id == GetCurrentThreadId()); } static inline void wined3d_not_from_cs(const struct wined3d_device *device) @@ -6103,7 +6103,7 @@ void compute_normal_matrix(float *normal_matrix, BOOL legacy_lighting, static inline struct wined3d_context *context_acquire(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - wined3d_from_cs(device->cs); + wined3d_from_cs(device); return device->adapter->adapter_ops->adapter_acquire_context(device, texture, sub_resource_idx); } -- 2.30.2

1 0

[PATCH 2/5] wininet: validate InternetGetLastResponseInfo() parameters
by Damjan Jovanovic 02 Jul '21

02 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 10 ++++++++++ dlls/wininet/tests/ftp.c | 7 +++++++ 2 files changed, 17 insertions(+)

2 1

[PATCH 1/5] wininet: improve InternetGetLastResponseInfo() logging
by Damjan Jovanovic 02 Jul '21

02 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 4/5] wininet: return the required buffer size from InternetGetLastResponseInfo() when it's too small
by Damjan Jovanovic 02 Jul '21

02 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 17 +++++++++++++++-- dlls/wininet/tests/ftp.c | 28 +++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-)

2 1

[PATCH 3/5] wininet: InternetGetLastResponseInfoW() returns wide chars, not ASCII
by Damjan Jovanovic 02 Jul '21

02 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH resend] uiribbon: Add stubs for IUIImageFromBitmap.
by Vijay Kiran Kamuju 02 Jul '21

02 Jul '21

This is resend of an earlier patch, which received no comments and dropped off the list. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] reg/tests: Check all error codes in delete_tree() before returning
by Hugh McMaster 02 Jul '21

02 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 2c1a2cf35e3..1be34602408 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -194,9 +194,8 @@ LONG delete_tree_(const char *file, unsigned line, HKEY root, const char *path, else ret = RegDeleteKeyExA(hkey, empty, sam, 0); - lok(!ret, "Failed to delete registry key, got error %d\n", ret); - cleanup: + lok(!ret, "Failed to delete registry key, got error %d\n", ret); HeapFree(GetProcessHeap(), 0, subkey_name); RegCloseKey(hkey); return ret; -- 2.32.0

1 1

[PATCH 8/8] gdi32/tests: Add more SelectObject tests.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/bitmap.c | 6 ++++++ dlls/gdi32/tests/font.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)

2 1

[PATCH 7/8] gdi32: Directly use ntgdi interface to select objects.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 30 +++++++++++++++--------------- dlls/gdi32/dc.c | 26 +++++++++++++------------- dlls/gdi32/dib.c | 6 +++--- dlls/gdi32/font.c | 16 ++++++++-------- dlls/gdi32/painting.c | 8 ++++---- 5 files changed, 43 insertions(+), 43 deletions(-)

2 1

[PATCH 6/8] gdi32: Use get_object_type for GetObjectType implementation.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 17 ----------------- dlls/gdi32/objects.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 17 deletions(-)

2 1

[PATCH 5/8] gdi32: Reimplement SelectObject on top of ntgdi interface.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It adds a new file. The idea is that this file does not depend on internals that will be private to win32u/ntgdi, but uses the public interface instead. It will eventually be a collection of win32u wrappers. dlls/gdi32/Makefile.in | 1 + dlls/gdi32/bitmap.c | 10 ---- dlls/gdi32/brush.c | 13 ----- dlls/gdi32/dc.c | 1 - dlls/gdi32/dib.c | 11 ----- dlls/gdi32/font.c | 11 ----- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 36 -------------- dlls/gdi32/objects.c | 102 +++++++++++++++++++++++++++++++++++++++ dlls/gdi32/palette.c | 1 - dlls/gdi32/pen.c | 12 ----- dlls/gdi32/region.c | 10 ---- 12 files changed, 103 insertions(+), 106 deletions(-) create mode 100644 dlls/gdi32/objects.c

2 1

[PATCH 4/8] gdi32: Introduce NtGdiSelectFont.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

2 1

[PATCH 3/8] gdi32: Introduce NtGdiSelectBrush.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)

2 1

[PATCH 2/8] gdi32: Introduce NtGdiSelectBitmap.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 15 ++++++++++--- dlls/gdi32/dib.c | 54 +-------------------------------------------- 2 files changed, 13 insertions(+), 56 deletions(-)

2 1

[PATCH 1/8] gdi32: Introduce NtGdiSelectPen.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The plan is that it will ultimately live in win32u. Before moving that, a fair amount of caricaturization is needed in gdi32. The idea is to first use ntgdi interface internally in gdi32, so that the move will be easy. dlls/gdi32/pen.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

2 2

[PATCH vkd3d v2] vkd3d-shader: Introduce shader_sm4_error() for reporting via vkd3d_shader_verror().
by Conor McCarthy 02 Jul '21

02 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 20 +++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 2ec2bcac..4bc62014 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -489,6 +489,8 @@ struct vkd3d_sm4_data struct list src_free; struct list src; struct vkd3d_shader_immediate_constant_buffer icb; + + struct vkd3d_shader_message_context *message_context; }; struct vkd3d_sm4_opcode_info @@ -561,6 +563,16 @@ static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv) return version->major >= 5 && version->minor >= 1; } +static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_sm4_data *priv, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(priv->message_context, NULL, error, format, args); + va_end(args); +} + static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, @@ -628,7 +640,11 @@ static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; if (range->last < range->first) + { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); + shader_sm4_error(priv, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, + "Last register %u must not be less than first register %u in range.\n", range->last, range->first); + } } static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, @@ -1343,7 +1359,7 @@ static enum vkd3d_data_type map_data_type(char t) } void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature) + const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) { DWORD version_token, token_count; struct vkd3d_sm4_data *priv; @@ -1424,6 +1440,8 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, list_init(&priv->src_free); list_init(&priv->src); + priv->message_context = message_context; + return priv; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 40d55b70..54654f3f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -344,7 +344,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, } if (!(parser->data = shader_sm4_init(shader_desc->byte_code, - shader_desc->byte_code_size, &shader_desc->output_signature))) + shader_desc->byte_code_size, &shader_desc->output_signature, message_context))) { WARN("Failed to initialize shader parser.\n"); free_shader_desc(shader_desc); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c61b3773..c5d1372a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -69,6 +69,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE = 6, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, + VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE = 1001, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, @@ -861,8 +862,10 @@ void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; +struct vkd3d_shader_message_context; + void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature) DECLSPEC_HIDDEN; + const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; void shader_sm4_free(void *data) DECLSPEC_HIDDEN; void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version) DECLSPEC_HIDDEN; -- 2.31.1

2 1

[PATCH vkd3d v2 1/7] vkd3d-shader: Introduce shader_sm4_set_descriptor_register_range().
by Conor McCarthy 02 Jul '21

02 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 70ab70aa..9b6956ca 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -630,6 +630,15 @@ static unsigned int shader_sm4_map_resource_idx(struct vkd3d_shader_register *re return reg->idx[0].offset; } +static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv, + struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) +{ + range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; + range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; + if (range->last < range->first) + FIXME("Invalid register range [%u:%u].\n", range->first, range->last); +} + static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) @@ -654,8 +663,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &semantic->resource.reg); - semantic->resource.range.first = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); - semantic->resource.range.last = semantic->resource.range.first; + shader_sm4_set_descriptor_register_range(priv, &semantic->resource.reg.reg, &semantic->resource.range); components = *tokens++; for (i = 0; i < VKD3D_VEC4_SIZE; i++) -- 2.31.1

2 13

Students Selected for OSPP Summer 2021
by Zhenbo Li 02 Jul '21

02 Jul '21

Hi All, I'm excited to announce that we have three students participating in OSPP Summer 2021. Welcome! Florian Eder: Implement robocopy.exe. Mentored by Zebediah Figura Atharva Nimbalkar: Port wined3d's GLSL generator to vkd3d-shader. Mentored by Henri Verbeet Qingyi Wang: Documentation improvements for vkd3d-shaders. Mentored by Henri Verbeet Wish you enjoy wine coding this summer :) -- Sincerely, Zhenbo Li

1 0

[PATCH] crypt32: Grow item size buffer by more than 1 at a time.
by Rémi Bernon 02 Jul '21

02 Jul '21

When Steam starts and connects, it sometimes does some crypt32 processing and ends up spending a huge amount of time in ntdll memcpy, reallocating buffers, effectively getting stuck while connecting to the user account. This is mainly caused by the growth of the item size array which is only done one item at a time, and allocating a bigger buffer initially and growing it by bigger steps solves the problem. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/crypt32/decode.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 5d195d42f7b..a0e78d62b4d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -628,7 +628,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, &dataLen))) { - DWORD bytesNeeded = arrayDesc->minArraySize, cItems = 0, decoded; + DWORD bytesNeeded = arrayDesc->minArraySize, cItems = 0, capacity = 0, decoded; BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); /* There can be arbitrarily many items, but there is often only one. */ @@ -687,17 +687,18 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, continue; } - cItems++; - if (itemSizes != &itemSize) - itemSizes = CryptMemRealloc(itemSizes, - cItems * sizeof(struct AsnArrayItemSize)); - else if (cItems > 1) + if (++cItems <= 1) + itemSizes = &itemSize; + else if (itemSizes == &itemSize) { - itemSizes = - CryptMemAlloc( - cItems * sizeof(struct AsnArrayItemSize)); - if (itemSizes) - *itemSizes = itemSize; + capacity = 1024; + itemSizes = CryptMemAlloc(capacity * sizeof(struct AsnArrayItemSize)); + if (itemSizes) *itemSizes = itemSize; + } + else if (cItems > capacity) + { + capacity = capacity * 3 / 2; + itemSizes = CryptMemRealloc(itemSizes, capacity * sizeof(struct AsnArrayItemSize)); } if (itemSizes) { -- 2.32.0

1 0

[PATCH 1/4] winegcc: Recognize .obj files as objects
by Connor Abbott 02 Jul '21

02 Jul '21

For more compatibility with mingw-gcc. Since meson always names object files with a .obj extension when using mingw, this improves compatibility with meson. Signed-off-by: Connor Abbott <cwabbott0(a)gmail.com> --- tools/winegcc/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 0b82af90683..63d675122c0 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -230,6 +230,7 @@ file_type get_file_type(const char* filename) if (cnt == sizeof(res_sig) && !memcmp(buf, res_sig, sizeof(res_sig))) return file_res; if (strendswith(filename, ".o")) return file_obj; + if (strendswith(filename, ".obj")) return file_obj; if (strendswith(filename, ".a")) return file_arh; if (strendswith(filename, ".res")) return file_res; if (strendswith(filename, ".so")) return file_so; -- 2.31.1

1 3

[PATCH v4] dinput: Introduce new HID joystick backend.
by Rémi Bernon 02 Jul '21

02 Jul '21

This adds a new joystick backend, implemented on top of HID and without any host dependencies. This will be progressively implementated, and it's not going to be usable until at least a few more patches. Because of that, and because it may also introduce regressions compared to the existing backends, it is disabled by default and is optionally enabled using the following global registry key: [HKCU\\Software\\Wine\\DirectInput\\Joysticks] "HID"="enabled" Or using the corresponding AppDefaults registry key: [HKCU\\Software\\Wine\\AppDefaults\\<app.exe>\\DirectInput\\Joysticks] "HID"="enabled" This setting will be removed later, when it becomes usable enough, to use the individual device disable mechanism available in joy.cpl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: * Fill instance fields and GUIDs in hid_joystick_device_try_open. * Use invalid index value when opening device by GUID, and match the instance GUIDs against the provided one instead of passing handle and pid_vid parameters. dlls/dinput/Makefile.in | 3 +- dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 17 +- dlls/dinput/joystick_hid.c | 497 ++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_private.h | 2 +- dlls/dinput8/Makefile.in | 3 +- 9 files changed, 519 insertions(+), 11 deletions(-) create mode 100644 dlls/dinput/joystick_hid.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index a22c8a72180..29d3e8ece65 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) @@ -12,6 +12,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c7b932aca44..88ee1855675 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -80,7 +80,8 @@ static const struct dinput_device *dinput_devices[] = &keyboard_device, &joystick_linuxinput_device, &joystick_linux_device, - &joystick_osx_device + &joystick_osx_device, + &joystick_hid_device, }; HINSTANCE DINPUT_instance; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 7e0f56c68df..c11b64585d9 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -67,6 +67,7 @@ struct DevicePlayer { extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8ea7850621c..60153d0d0f3 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -271,13 +271,13 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) } } -BOOL device_disabled_registry(const char* name) +BOOL device_disabled_registry(const char* name, BOOL disable) { static const char disabled_str[] = "disabled"; + static const char enabled_str[] = "enabled"; static const char joystick_key[] = "Joysticks"; char buffer[MAX_PATH]; HKEY hkey, appkey, temp; - BOOL do_disable = FALSE; get_app_key(&hkey, &appkey); @@ -297,16 +297,23 @@ BOOL device_disabled_registry(const char* name) /* Look for the "controllername"="disabled" key */ if (!get_config_key(hkey, appkey, name, buffer, sizeof(buffer))) - if (!strcmp(disabled_str, buffer)) + { + if (!disable && !strcmp(disabled_str, buffer)) { TRACE("Disabling joystick '%s' based on registry key.\n", name); - do_disable = TRUE; + disable = TRUE; + } + else if (disable && !strcmp(enabled_str, buffer)) + { + TRACE("Enabling joystick '%s' based on registry key.\n", name); + disable = FALSE; } + } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - return do_disable; + return disable; } BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c new file mode 100644 index 00000000000..90362da1e1a --- /dev/null +++ b/dlls/dinput/joystick_hid.c @@ -0,0 +1,497 @@ +/* DirectInput HID Joystick device + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" + +#include "ddk/hidsdi.h" +#include "setupapi.h" +#include "devguid.h" +#include "dinput.h" +#include "setupapi.h" + +#include "wine/debug.h" + +#include "dinput_private.h" +#include "device_private.h" +#include "joystick_private.h" + +#include "initguid.h" +#include "devpkey.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); +DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); + +struct hid_joystick +{ + IDirectInputDeviceImpl base; + + HANDLE device; + PHIDP_PREPARSED_DATA preparsed; +}; + +static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) +{ + return CONTAINING_RECORD( CONTAINING_RECORD( iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface ), + struct hid_joystick, base ); +} + +static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct hid_joystick tmp = *impl; + ULONG res; + + if (!(res = IDirectInputDevice2WImpl_Release( iface ))) + { + HidD_FreePreparsedData( tmp.preparsed ); + CloseHandle( tmp.device ); + } + + return res; +} + +static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, DIDEVCAPS *caps ) +{ + FIXME( "iface %p, caps %p stub!\n", iface, caps ); + + if (!caps) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, REFGUID guid, DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, REFGUID guid, const DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Acquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Unacquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) +{ + FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); + + if (!ptr) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, DIDEVICEOBJECTINSTANCEW *instance, + DWORD obj, DWORD how ) +{ + FIXME( "iface %p, instance %p, obj %#x, how %#x stub!\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, REFGUID rguid, + const DIEFFECT *effect, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, rguid %s, effect %p, out %p, outer %p stub!\n", iface, debugstr_guid( rguid ), + effect, out, outer ); + + if (!out) return E_POINTER; + if (!rguid || !effect) return DI_NOEFFECT; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *ref, DWORD type ) +{ + FIXME( "iface %p, callback %p, ref %p, type %#x stub!\n", iface, callback, ref, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, REFGUID guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD flags ) +{ + FIXME( "iface %p, flags %x stub!\n", iface, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + FIXME( "iface %p, format %p, username %s, flags %#x stub!\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SetActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, format %p, username %s, flags %#x.\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return _set_action_map( iface, format, username, flags, impl->base.data_format.wine_df ); +} + +static const IDirectInputDevice8WVtbl hid_joystick_vtbl = +{ + /*** IUnknown methods ***/ + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + hid_joystick_Release, + /*** IDirectInputDevice methods ***/ + hid_joystick_GetCapabilities, + hid_joystick_EnumObjects, + hid_joystick_GetProperty, + hid_joystick_SetProperty, + hid_joystick_Acquire, + hid_joystick_Unacquire, + hid_joystick_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + hid_joystick_GetObjectInfo, + hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + /*** IDirectInputDevice2 methods ***/ + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + IDirectInputDevice2WImpl_Poll, + IDirectInputDevice2WImpl_SendDeviceData, + /*** IDirectInputDevice7 methods ***/ + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + /*** IDirectInputDevice8 methods ***/ + hid_joystick_BuildActionMap, + hid_joystick_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo, +}; + +static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HANDLE *device, + PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, + HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance, DWORD version ) +{ + PHIDP_PREPARSED_DATA preparsed_data = NULL; + HANDLE device_file; + + device_file = CreateFileW( path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0 ); + if (device_file == INVALID_HANDLE_VALUE) return FALSE; + + if (!HidD_GetPreparsedData( device_file, &preparsed_data )) goto failed; + if (!HidD_GetAttributes( device_file, attrs )) goto failed; + if (HidP_GetCaps( preparsed_data, caps ) != HIDP_STATUS_SUCCESS) goto failed; + + if (caps->UsagePage == HID_USAGE_PAGE_GAME) FIXME( "Unimplemented HID game usage page!\n" ); + if (caps->UsagePage == HID_USAGE_PAGE_SIMULATION) FIXME( "Unimplemented HID simulation usage page!\n" ); + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; + if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; + + if (!HidD_GetProductString( device_file, instance->tszInstanceName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( device_file, instance->tszProductName, MAX_PATH )) goto failed; + + instance->guidInstance = hid_joystick_guid; + instance->guidInstance.Data1 ^= handle; + instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); + instance->dwDevType = get_device_type( version, caps->Usage != HID_USAGE_GENERIC_GAMEPAD ) | DIDEVTYPE_HID; + instance->guidFFDriver = GUID_NULL; + instance->wUsagePage = caps->UsagePage; + instance->wUsage = caps->Usage; + + *device = device_file; + *preparsed = preparsed_data; + return TRUE; + +failed: + CloseHandle( device_file ); + HidD_FreePreparsedData( preparsed_data ); + return FALSE; +} + +static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, WCHAR *device_path, + HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DWORD version ) +{ + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA devinfo = {sizeof(devinfo)}; + DIDEVICEINSTANCEW instance = *filter; + UINT32 i = 0, handle; + HDEVINFO set; + DWORD type; + GUID hid; + + TRACE( "index %d, product %s, instance %s\n", index, debugstr_guid( &filter->guidProduct ), + debugstr_guid( &filter->guidInstance ) ); + + HidD_GetHidGuid( &hid ); + + set = SetupDiGetClassDevsW( &hid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + if (set == INVALID_HANDLE_VALUE) return DIERR_DEVICENOTREG; + + *device = NULL; + *preparsed = NULL; + while (SetupDiEnumDeviceInterfaces( set, NULL, &hid, i++, &iface )) + { + detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof(buffer), NULL, &devinfo )) + continue; + if (!SetupDiGetDevicePropertyW( set, &devinfo, &DEVPROPKEY_HID_HANDLE, &type, + (BYTE *)&handle, sizeof(handle), NULL, 0 ) || + type != DEVPROP_TYPE_UINT32) + continue; + if (!hid_joystick_device_try_open( handle, detail->DevicePath, device, preparsed, + attrs, caps, &instance, version )) + continue; + + /* enumerate device by GUID */ + if (index < 0 && IsEqualGUID( &filter->guidProduct, &instance.guidProduct )) break; + if (index < 0 && IsEqualGUID( &filter->guidInstance, &instance.guidInstance )) break; + + /* enumerate all devices */ + if (index >= 0 && !index--) break; + + CloseHandle( *device ); + HidD_FreePreparsedData( *preparsed ); + *device = NULL; + *preparsed = NULL; + } + + SetupDiDestroyDeviceInfoList( set ); + if (!*device || !*preparsed) return DIERR_DEVICENOTREG; + + lstrcpynW( device_path, detail->DevicePath, MAX_PATH ); + *filter = instance; + return DI_OK; +} + +static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, + DWORD version, int index ) +{ + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + PHIDP_PREPARSED_DATA preparsed; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "type %x, flags %#x, instance %p, version %04x, index %d\n", type, flags, instance, version, index ); + + hr = hid_joystick_device_open( index, instance, device_path, &device, &preparsed, + &attrs, &caps, version ); + if (hr != DI_OK) return hr; + + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return S_FALSE; + if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) + return S_FALSE; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) + return S_FALSE; + + if (device_disabled_registry( "HID", TRUE )) + return DIERR_DEVICENOTREG; + + TRACE( "Found device %s, usage %04x:%04x, product %s, instance %s, name %s\n", debugstr_w(device_path), + instance->wUsagePage, instance->wUsage, debugstr_guid( &instance->guidProduct ), + debugstr_guid( &instance->guidInstance ), debugstr_w(instance->tszInstanceName) ); + + return DI_OK; +} + +static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, REFGUID guid, IDirectInputDevice8W **out ) +{ + DIDEVICEINSTANCEW instance = {.dwSize = sizeof(instance), .guidProduct = *guid, .guidInstance = *guid}; + DWORD size = sizeof(struct hid_joystick); + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + struct hid_joystick *impl = NULL; + PHIDP_PREPARSED_DATA preparsed; + DIDATAFORMAT *format = NULL; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + instance.guidProduct.Data1 = DInput_PIDVID_Product_GUID.Data1; + instance.guidInstance.Data1 = hid_joystick_guid.Data1; + if (IsEqualGUID( &DInput_PIDVID_Product_GUID, &instance.guidProduct )) + instance.guidProduct = *guid; + else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) + instance.guidInstance = *guid; + else + return DIERR_DEVICENOTREG; + + hr = hid_joystick_device_open( -1, &instance, device_path, &device, &preparsed, + &attrs, &caps, dinput->dwVersion ); + if (hr != DI_OK) return hr; + + hr = direct_input_device_alloc( size, &hid_joystick_vtbl, guid, dinput, (void **)&impl ); + if (FAILED(hr)) goto failed; + + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + + impl->device = device; + impl->preparsed = preparsed; + + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) goto failed; + impl->base.data_format.wine_df = format; + + TRACE( "Created %p\n", impl ); + + *out = &impl->base.IDirectInputDevice8W_iface; + return DI_OK; + +failed: + HeapFree( GetProcessHeap(), 0, format ); + HeapFree( GetProcessHeap(), 0, impl ); + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + return hr; +} + +const struct dinput_device joystick_hid_device = +{ + "Wine HID joystick driver", + hid_joystick_enum_device, + hid_joystick_create_device, +}; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3215978c995..312ef3d9c42 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -175,7 +175,7 @@ static INT find_joystick_devices(void) /* Append driver name */ strcat(joydev.name, JOYDEVDRIVER); - if (device_disabled_registry(joydev.name)) { + if (device_disabled_registry(joydev.name, FALSE)) { close(fd); continue; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2b970271ec3..558c8cc19e5 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -264,7 +264,7 @@ static void find_joydevs(void) else joydev.name = joydev.device; - if (device_disabled_registry(joydev.name)) { + if (device_disabled_registry(joydev.name, FALSE)) { close(fd); HeapFree(GetProcessHeap(), 0, joydev.name); if (joydev.name != joydev.device) diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 874bf3e69a7..9cc30605234 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -57,7 +57,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; -BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; +BOOL device_disabled_registry(const char* name, BOOL disable) DECLSPEC_HIDDEN; ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface); diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 35b3bfb75f5..5032c7689bc 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput @@ -13,6 +13,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ -- 2.32.0

1 0

[PATCH website] winehq: Announcement for OSPP Summer 2021
by Zhenbo Li 02 Jul '21

02 Jul '21

-- Sincerely, Zhenbo Li

1 0

[PATCH 1/6] ntoskrnl.exe/tests: Sync test utils with wine/test.h.
by Rémi Bernon 02 Jul '21

02 Jul '21

Adding support for thread local test data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/Makefile.in | 10 +- dlls/ntoskrnl.exe/tests/driver.c | 32 +-- dlls/ntoskrnl.exe/tests/driver.h | 4 +- dlls/ntoskrnl.exe/tests/driver_netio.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 + dlls/ntoskrnl.exe/tests/utils.h | 349 +++++++++++++++++++------ 6 files changed, 294 insertions(+), 106 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 863fad30f63..85a6925138a 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,15 +1,15 @@ TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid -driver_IMPORTS = winecrt0 ntoskrnl +driver_IMPORTS = winecrt0 ntoskrnl hal driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver2_IMPORTS = winecrt0 ntoskrnl +driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver3_IMPORTS = winecrt0 ntoskrnl +driver3_IMPORTS = winecrt0 ntoskrnl hal driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_hid_IMPORTS = winecrt0 ntoskrnl hidclass +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..1fe3ec2e558 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -999,41 +999,41 @@ static void test_call_driver(DEVICE_OBJECT *device) irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); - ok(iosb.Information == 123, "got information %#x\n", iosb.Information); + ok(iosb.Information == 123, "got information %#I64x\n", (UINT64)iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &event, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), @@ -1041,8 +1041,8 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); @@ -1118,7 +1118,7 @@ static void test_cancel_irp(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 1, "CurrentLocation = %u\n", irp->CurrentLocation); irpsp = IoGetCurrentIrpStackLocation(irp); - ok(irpsp->DeviceObject == device, "DeviceObject = %u\n", irpsp->DeviceObject); + ok(irpsp->DeviceObject == device, "DeviceObject = %p\n", irpsp->DeviceObject); IoSetCancelRoutine(irp, cancel_irp); cancel_cnt = 0; @@ -1432,16 +1432,16 @@ static void check_resource_(int line, ERESOURCE *resource, ULONG exclusive_waite ULONG count; count = ExGetExclusiveWaiterCount(resource); - ok_(__FILE__, line, count == exclusive_waiters, + ok_(__FILE__, line)(count == exclusive_waiters, "expected %u exclusive waiters, got %u\n", exclusive_waiters, count); count = ExGetSharedWaiterCount(resource); - ok_(__FILE__, line, count == shared_waiters, + ok_(__FILE__, line)(count == shared_waiters, "expected %u shared waiters, got %u\n", shared_waiters, count); ret = ExIsResourceAcquiredExclusiveLite(resource); - ok_(__FILE__, line, ret == exclusive, + ok_(__FILE__, line)(ret == exclusive, "expected exclusive %u, got %u\n", exclusive, ret); count = ExIsResourceAcquiredSharedLite(resource); - ok_(__FILE__, line, count == shared_count, + ok_(__FILE__, line)(count == shared_count, "expected shared %u, got %u\n", shared_count, count); } #define check_resource(a,b,c,d,e) check_resource_(__LINE__,a,b,c,d,e) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 455695ad36b..b0c7cab0252 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -51,10 +51,12 @@ static const char teststr[] = "Wine is not an emulator"; struct test_data { + char winetest_platform[256]; int running_under_wine; int winetest_report_success; int winetest_debug; - int successes, failures, skipped, todo_successes, todo_failures; + int failures; + int todo_failures; }; struct main_test_input diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ea9cfd1a4c5..4ebacc7cf14 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -141,7 +141,7 @@ static void test_wsk_get_address_info(void) { struct sockaddr_in *addr = (struct sockaddr_in *)addr_info->ai_addr; - ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %u.\n", addr_info->ai_addrlen); + ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %I64u.\n", (UINT64)addr_info->ai_addrlen); ok(addr->sin_family == AF_INET, "Got unexpected sin_family %u.\n", addr->sin_family); ok(ntohs(addr->sin_port) == 12345, "Got unexpected sin_port %u.\n", ntohs(addr->sin_port)); ok(ntohl(addr->sin_addr.s_addr) == 0x7f000001, "Got unexpected sin_addr %#x.\n", diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 71dbfe1a5e9..57c1bdd17fd 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -386,6 +386,7 @@ static void cat_okfile(void) SetEndOfFile(okfile); winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + winetest_add_failures(InterlockedExchange(&test_data->todo_failures, 0)); } static ULONG64 modified_value; @@ -2598,6 +2599,8 @@ START_TEST(ntoskrnl) 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); ok(!!mapping, "got error %u\n", GetLastError()); test_data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); + ok(strlen(winetest_platform) < 256, "winetest_platform expectedly large!\n"); + strcpy(test_data->winetest_platform, winetest_platform); test_data->running_under_wine = !strcmp(winetest_platform, "wine"); test_data->winetest_report_success = winetest_report_success; test_data->winetest_debug = winetest_debug; diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 6a0e00428a5..6c6a8f20aeb 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -22,18 +22,115 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -static HANDLE okfile; -static LONG successes; -static LONG failures; -static LONG skipped; -static LONG todo_successes; -static LONG todo_failures; -static int todo_level, todo_do_loop; +#include <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winternl.h> + +#include <ddk/wdm.h> +#include <wine/test.h> + +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +# define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __winetest_va_end(list) __builtin_ms_va_end(list) +#else +# define __winetest_va_start(list,arg) va_start(list,arg) +# define __winetest_va_end(list) va_end(list) +#endif + static int running_under_wine; -static int winetest_debug; -static int winetest_report_success; -static inline void kvprintf(const char *format, __ms_va_list ap) +/* debug level */ +int winetest_debug = 1; + +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + +/* interactive mode? */ +int winetest_interactive = 0; + +/* current platform */ +static char winetest_platform_buf[256] = "windows"; +const char *winetest_platform = winetest_platform_buf; + +/* report successful tests (BOOL) */ +int winetest_report_success = 0; + +/* silence todos and skips above this threshold */ +int winetest_mute_threshold = 42; + +static LONG successes; /* number of successful tests */ +static LONG failures; /* number of failures */ +static LONG skipped; /* number of skipped test chunks */ +static LONG todo_successes; /* number of successful tests inside todo block */ +static LONG todo_failures; /* number of failures inside todo block */ +static LONG muted_traces; /* number of silenced traces */ +static LONG muted_skipped; /* same as skipped but silent */ +static LONG muted_todo_successes; /* same as todo_successes but silent */ + +/* counts how many times a given line printed a message */ +static LONG line_counters[16384]; + +/* output file for driver tests */ +HANDLE okfile; + +/* The following data must be kept track of on a per-thread basis */ +struct tls_data +{ + HANDLE thread; + const char* current_file; /* file of current check */ + int current_line; /* line of current check */ + unsigned int todo_level; /* current todo nesting level */ + int todo_do_loop; + char *str_pos; /* position in debug buffer */ + char strings[2000]; /* buffer for debug strings */ + char context[8][128]; /* data to print before messages */ + unsigned int context_count; /* number of context prefixes */ +}; + +static KSPIN_LOCK tls_data_lock; +static struct tls_data tls_data_pool[128]; +static DWORD tls_data_count; + +static struct tls_data *get_tls_data(void) +{ + static struct tls_data tls_overflow; + struct tls_data *data; + HANDLE thread = PsGetCurrentThreadId(); + KIRQL irql; + + KeAcquireSpinLock(&tls_data_lock, &irql); + for (data = tls_data_pool; data != tls_data_pool + tls_data_count; ++data) + if (data->thread == thread) break; + if (data == tls_data_pool + ARRAY_SIZE(tls_data_pool)) + data = &tls_overflow; + else if (data == tls_data_pool + tls_data_count) + { + data->thread = thread; + data->str_pos = data->strings; + tls_data_count++; + } + KeReleaseSpinLock(&tls_data_lock, irql); + + return data; +} + +void winetest_set_location( const char* file, int line ) +{ + struct tls_data *data = get_tls_data(); + data->current_file=strrchr(file,'/'); + if (data->current_file==NULL) + data->current_file=strrchr(file,'\\'); + if (data->current_file==NULL) + data->current_file=file; + else + data->current_file++; + data->current_line=line; +} + +static inline void kvprintf(const char *format, __winetest_va_list ap) { static char buffer[512]; IO_STATUS_BLOCK io; @@ -43,11 +140,11 @@ static inline void kvprintf(const char *format, __ms_va_list ap) static inline void WINAPIV kprintf(const char *format, ...) { - __ms_va_list valist; + __winetest_va_list valist; - __ms_va_start(valist, format); + __winetest_va_start(valist, format); kvprintf(format, valist); - __ms_va_end(valist); + __winetest_va_end(valist); } static inline NTSTATUS winetest_init(void) @@ -61,6 +158,8 @@ static inline NTSTATUS winetest_init(void) HANDLE section; NTSTATUS ret; + KeInitializeSpinLock(&tls_data_lock); + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); @@ -77,6 +176,7 @@ static inline NTSTATUS winetest_init(void) running_under_wine = data->running_under_wine; winetest_debug = data->winetest_debug; winetest_report_success = data->winetest_report_success; + strcpy(winetest_platform_buf, data->winetest_platform); ZwUnmapViewOfSection(NtCurrentProcess(), addr); ZwClose(section); @@ -114,10 +214,7 @@ static inline void winetest_cleanup(void) { data = addr; - InterlockedExchangeAdd(&data->successes, successes); InterlockedExchangeAdd(&data->failures, failures); - InterlockedExchangeAdd(&data->skipped, skipped); - InterlockedExchangeAdd(&data->todo_successes, todo_successes); InterlockedExchangeAdd(&data->todo_failures, todo_failures); ZwUnmapViewOfSection(NtCurrentProcess(), addr); @@ -128,130 +225,216 @@ static inline void winetest_cleanup(void) ZwClose(okfile); } -static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) +static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static void __winetest_cdecl winetest_printf( const char *msg, ... ) { - const char *current_file; + struct tls_data *data = get_tls_data(); + __winetest_va_list valist; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; + kprintf( "%s:%d: ", data->current_file, data->current_line ); + __winetest_va_start( valist, msg ); + kvprintf( msg, valist ); + __winetest_va_end( valist ); +} +static void __winetest_cdecl winetest_print_context( const char *msgtype ) +{ + struct tls_data *data = get_tls_data(); + unsigned int i; + + winetest_printf( "%s", msgtype ); + for (i = 0; i < data->context_count; ++i) + kprintf( "%s: ", data->context[i] ); +} - if (todo_level) +int broken( int condition ) +{ + return (strcmp(winetest_platform, "windows") == 0) && condition; +} + +static LONG winetest_add_line( void ) +{ + struct tls_data *data; + int index, count; + + if (winetest_debug > 1) + return 0; + + data = get_tls_data(); + index = data->current_line % ARRAY_SIZE(line_counters); + count = InterlockedIncrement(line_counters + index) - 1; + if (count == winetest_mute_threshold) + winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); + + return count; +} + +/* + * Checks condition. + * Parameters: + * - condition - condition to check; + * - msg test description; + * - file - test application source code file name of the check + * - line - test application source code file line number of the check + * Return: + * 0 if condition does not have the expected value, 1 otherwise + */ +int winetest_vok( int condition, const char *msg, __winetest_va_list args ) +{ + struct tls_data *data = get_tls_data(); + + if (data->todo_level) { if (condition) { - kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); + winetest_print_context( "Test succeeded inside todo block: " ); kvprintf(msg, args); InterlockedIncrement(&todo_failures); + return 0; } else { - if (winetest_debug > 0) + if (!winetest_debug || + winetest_add_line() < winetest_mute_threshold) { - kprintf("%s:%d: Test marked todo: ", current_file, line); - kvprintf(msg, args); + if (winetest_debug > 0) + { + winetest_print_context( "Test marked todo: " ); + kvprintf(msg, args); + } + InterlockedIncrement(&todo_successes); } - InterlockedIncrement(&todo_successes); + else + InterlockedIncrement(&muted_todo_successes); + return 1; } } else { if (!condition) { - kprintf("%s:%d: Test failed: ", current_file, line); + winetest_print_context( "Test failed: " ); kvprintf(msg, args); InterlockedIncrement(&failures); + return 0; } else { if (winetest_report_success) - kprintf("%s:%d: Test succeeded\n", current_file, line); + winetest_printf("Test succeeded\n"); InterlockedIncrement(&successes); + return 1; } } } -static inline void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) { - __ms_va_list args; - __ms_va_start(args, msg); - vok_(file, line, condition, msg, args); - __ms_va_end(args); + __winetest_va_list valist; + + __winetest_va_start(valist, msg); + winetest_vok(condition, msg, valist); + __winetest_va_end(valist); } -static inline void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +void __winetest_cdecl winetest_trace( const char *msg, ... ) { - const char *current_file; + __winetest_va_list valist; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; + if (!winetest_debug) + return; + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "" ); + __winetest_va_start(valist, msg); + kvprintf( msg, valist ); + __winetest_va_end(valist); + } else - current_file++; - - kprintf("%s:%d: Tests skipped: ", current_file, line); - kvprintf(msg, args); - skipped++; + InterlockedIncrement(&muted_traces); } -static inline void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +void winetest_vskip( const char *msg, __winetest_va_list args ) { - __ms_va_list args; - __ms_va_start(args, msg); - if (running_under_wine) - vok_(file, line, 0, msg, args); + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "Tests skipped: " ); + kvprintf(msg, args); + InterlockedIncrement(&skipped); + } else - vskip_(file, line, msg, args); - __ms_va_end(args); + InterlockedIncrement(&muted_skipped); } -static inline void WINAPIV trace_(const char *file, int line, const char *msg, ...) +void __winetest_cdecl winetest_skip( const char *msg, ... ) { - const char *current_file; - __ms_va_list args; + __winetest_va_list valist; + __winetest_va_start(valist, msg); + winetest_vskip(msg, valist); + __winetest_va_end(valist); +} - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; +void __winetest_cdecl winetest_win_skip( const char *msg, ... ) +{ + __winetest_va_list valist; + __winetest_va_start(valist, msg); + if (strcmp(winetest_platform, "windows") == 0) + winetest_vskip(msg, valist); else - current_file++; - - __ms_va_start(args, msg); - kprintf("%s:%d: ", current_file, line); - kvprintf(msg, args); - __ms_va_end(args); + winetest_vok(0, msg, valist); + __winetest_va_end(valist); } -static inline void winetest_start_todo( int is_todo ) +void winetest_start_todo( int is_todo ) { - todo_level = (todo_level << 1) | (is_todo != 0); - todo_do_loop=1; + struct tls_data *data = get_tls_data(); + data->todo_level = (data->todo_level << 1) | (is_todo != 0); + data->todo_do_loop=1; } -static inline int winetest_loop_todo(void) +int winetest_loop_todo(void) { - int do_loop=todo_do_loop; - todo_do_loop=0; + struct tls_data *data = get_tls_data(); + int do_loop=data->todo_do_loop; + data->todo_do_loop=0; return do_loop; } -static inline void winetest_end_todo(void) +void winetest_end_todo(void) { - todo_level >>= 1; + struct tls_data *data = get_tls_data(); + data->todo_level >>= 1; } -static inline int broken(int condition) +void __winetest_cdecl winetest_push_context( const char *fmt, ... ) { - return !running_under_wine && condition; + struct tls_data *data = get_tls_data(); + __winetest_va_list valist; + + if (data->context_count < ARRAY_SIZE(data->context)) + { + __winetest_va_start(valist, fmt); + vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); + __winetest_va_end(valist); + data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; + } + ++data->context_count; } -#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ - winetest_loop_todo(); \ - winetest_end_todo()) -#define todo_wine todo_if(running_under_wine) -#define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) -#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_(__FILE__, __LINE__, __VA_ARGS__) +void winetest_pop_context(void) +{ + struct tls_data *data = get_tls_data(); + + if (data->context_count) + --data->context_count; +} + +LONG winetest_get_failures(void) +{ + return failures; +} + +void winetest_add_failures( LONG new_failures ) +{ + while (new_failures-- > 0) + InterlockedIncrement( &failures ); +} -- 2.32.0

2 6

[PATCH] dbghelp/tests: try to fix failure in current dbghelp tests
by Eric Pouech 02 Jul '21

02 Jul '21

Testbot failures in previous SymGetTypeFromName patch have nothing to do with that former patch. Trying to address errouneous test. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 7be58c55b91..7fd1f6fb883 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -108,7 +108,7 @@ static void test_stack_walk(void) addr = (void *)(DWORD_PTR)frame.AddrPC.Offset; - if (addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) + if (!found_our_frame && addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) { found_our_frame = TRUE;

1 0

[PATCH 5/5] iphlpapi: Rewrite ConvertInterfaceLuidToNameA/NameToLuidA() to call their unicode equivalents.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 38 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8540b594e53..b6b96165027 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3244,21 +3244,20 @@ DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID *luid, NET_IFINDEX *inde */ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_T len) { - DWORD ret; - MIB_IFROW row; + DWORD err; + WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - TRACE("(%p %p %u)\n", luid, name, (DWORD)len); + TRACE( "(%p %p %u)\n", luid, name, (DWORD)len ); if (!luid) return ERROR_INVALID_PARAMETER; + if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - if (!name || len < WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, NULL, 0, NULL, NULL )) - return ERROR_NOT_ENOUGH_MEMORY; + err = ConvertInterfaceLuidToNameW( luid, nameW, ARRAY_SIZE(nameW) ); + if (err) return err; - WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, name, len, NULL, NULL ); - return NO_ERROR; + if (!WideCharToMultiByte( CP_UNIXCP, 0, nameW, -1, name, len, NULL, NULL )) + err = GetLastError(); + return err; } /****************************************************************** @@ -3286,22 +3285,15 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE */ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) { - DWORD ret; - IF_INDEX index; - MIB_IFROW row; - - TRACE("(%s %p)\n", debugstr_a(name), luid); + WCHAR nameW[IF_MAX_STRING_SIZE]; - if ((ret = getInterfaceIndexByName( name, &index ))) return ERROR_INVALID_NAME; - if (!luid) return ERROR_INVALID_PARAMETER; + TRACE( "(%s %p)\n", debugstr_a(name), luid ); - row.dwIndex = index; - if ((ret = GetIfEntry( &row ))) return ret; + if (!name) return ERROR_INVALID_NAME; + if (!MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) + return GetLastError(); - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + return ConvertInterfaceNameToLuidW( nameW, luid ); } /****************************************************************** -- 2.23.0

1 0

[PATCH 4/5] iphlpapi: Implement if_indextoname() using the ConvertInterface* functions.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index aaa6a80c19e..8540b594e53 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3374,11 +3374,19 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) /****************************************************************** * if_indextoname (IPHLPAPI.@) */ -PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name ) { - TRACE("(%u, %p)\n", index, name); + NET_LUID luid; + DWORD err; + + TRACE( "(%u, %p)\n", index, name ); + + err = ConvertInterfaceIndexToLuid( index, &luid ); + if (err) return NULL; - return getInterfaceNameByIndex(index, name); + err = ConvertInterfaceLuidToNameA( &luid, name, IF_MAX_STRING_SIZE ); + if (err) return NULL; + return name; } /****************************************************************** -- 2.23.0

1 0

[PATCH 3/5] iphlpapi: Implement if_nametoindex() using the ConvertInterface* functions.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a774e60c3d9..aaa6a80c19e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3357,13 +3357,18 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) { - IF_INDEX idx; + IF_INDEX index; + NET_LUID luid; + DWORD err; - TRACE("(%s)\n", name); - if (getInterfaceIndexByName(name, &idx) == NO_ERROR) - return idx; + TRACE( "(%s)\n", name ); - return 0; + err = ConvertInterfaceNameToLuidA( name, &luid ); + if (err) return 0; + + err = ConvertInterfaceLuidToIndex( &luid, &index ); + if (err) index = 0; + return index; } /****************************************************************** -- 2.23.0

1 0

[PATCH 2/5] iphlpapi: Use ConvertInterfaceIndexToLuid() where possible.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7b104330ba7..a774e60c3d9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1052,8 +1052,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); aa->ConnectionType = connectionTypeFromMibType(type); - aa->Luid.Info.NetLuidIndex = index; - aa->Luid.Info.IfType = aa->IfType; + ConvertInterfaceIndexToLuid( index, &aa->Luid ); if (output_gateways && num_v4_gateways) { @@ -1796,10 +1795,8 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) if ((ret = getInterfaceStatsByName( name, &row ))) return ret; memset( row2, 0, sizeof(*row2) ); - row2->InterfaceLuid.Info.Reserved = 0; - row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; - row2->InterfaceLuid.Info.IfType = row.dwType; row2->InterfaceIndex = row.dwIndex; + ConvertInterfaceIndexToLuid( row2->InterfaceIndex, &row2->InterfaceLuid ); ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu; -- 2.23.0

1 0

[PATCH 1/5] nsiproxy: Implement NDIS index to luid get_parameter.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/ndis.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index d7f6ac9c739..cefd42983d4 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -382,9 +382,39 @@ static void test_ndis_ifinfo( void ) NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } +static void test_ndis_index_luid( void ) +{ + DWORD err, count, i; + NET_LUID *luids, luid; + DWORD index; + + /* index -> luid map. NsiAllocateAndGetTable and NsiGetAllParameters fail */ + + /* first get the luids */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luids, sizeof(*luids), + NULL, 0, NULL, 0, NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + + for (i = 0; i < count; i++) + { + ConvertInterfaceLuidToIndex( luids + i, &index ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, &luid, sizeof(luid), 0 ); + ok( !err, "got %d\n", err ); + ok( luid.Value == luids[i].Value, "%d: luid mismatch\n", i ); + } + NsiFreeTable( luids, NULL, NULL, NULL ); + + index = ~0u; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, &luid, sizeof(luid), 0 ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); +} + START_TEST( nsi ) { test_nsi_api(); test_ndis_ifinfo(); + test_ndis_index_luid(); } diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 647fd650cd3..38e6802e3bd 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -584,6 +584,31 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par return status; } +static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); + + if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_index( *(DWORD *)key ); + if (entry) + { + *(NET_LUID *)data = entry->if_luid; + status = STATUS_SUCCESS; + } + LeaveCriticalSection( &if_list_cs ); + return status; +} + static const struct module_table tables[] = { { @@ -596,6 +621,16 @@ static const struct module_table tables[] = ifinfo_get_all_parameters, ifinfo_get_parameter }, + { + NSI_NDIS_INDEX_LUID_TABLE, + { + sizeof(DWORD), 0, + 0, sizeof(NET_LUID) + }, + NULL, + NULL, + index_luid_get_parameter + }, { ~0u } }; -- 2.23.0

1 0

[PATCH] dbghelp: fix SymGetTypeFromName
by Eric Pouech 02 Jul '21

02 Jul '21

Correctly initialize the module_pair structure Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index c322157d57d..be7c8378e8c 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -924,12 +924,12 @@ BOOL WINAPI SymGetTypeInfo(HANDLE hProcess, DWORD64 ModBase, BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Name, PSYMBOL_INFO Symbol) { - struct process* pcs = process_find_by_handle(hProcess); struct module_pair pair; struct symt* type; - if (!pcs) return FALSE; - pair.requested = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); if (!module_get_debug(&pair)) return FALSE; type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE;

1 0

[PATCH] winedbg: gdb proxy's exec-file:read command
by Eric Pouech 02 Jul '21

02 Jul '21

Added support for qXfer:exec-file:read command in gdb proxy. This removes lots of garbage spitted by gdb. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b8a8a1da2f8..04f1dabd312 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1850,6 +1850,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_add(gdbctx, "qXfer:libraries:read+;"); packet_reply_add(gdbctx, "qXfer:threads:read+;"); packet_reply_add(gdbctx, "qXfer:features:read+;"); + packet_reply_add(gdbctx, "qXfer:exec-file:read+;"); packet_reply_close(gdbctx); return packet_done; } @@ -1910,6 +1911,25 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_close_xfer(gdbctx, off, len); return packet_done; } + + if (sscanf(gdbctx->in_packet, "Xfer:exec-file:read::%x,%x", &off, &len) == 2) + { + BOOL is_wow64; + char* unix_path; + char* tmp; + + if (!gdbctx->process || !gdbctx->process->imageName) return packet_error; + if (!(unix_path = wine_get_unix_file_name(gdbctx->process->imageName))) return packet_error; + + if (IsWow64Process(gdbctx->process->handle, &is_wow64) && + is_wow64 && (tmp = strstr(unix_path, "system32"))) + memcpy(tmp, "syswow64", 8); + packet_reply_open_xfer(gdbctx); + packet_reply_add(gdbctx, unix_path); + packet_reply_close_xfer(gdbctx, off, len); + HeapFree(GetProcessHeap(), 0, unix_path); + return packet_done; + } break; } ERR("Unhandled query %s\n", debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len));

1 0

[PATCH] winedbg: Added helper in gdbproxy mode to get proper address width information
by Eric Pouech 02 Jul '21

02 Jul '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 19fa86d44da..89dcc14dcf6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -702,6 +702,13 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, * =============================================== * */ +static int addr_width(struct gdb_context* gdbctx) +{ + int sz = (gdbctx && gdbctx->process && gdbctx->process->be_cpu) ? + gdbctx->process->be_cpu->pointer_size : (int)sizeof(void*); + return sz * 2; +} + enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; @@ -1343,7 +1350,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); @@ -1468,8 +1475,8 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } packet_reply_open(gdbctx); snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n", - (unsigned)sizeof(void*), (DWORD_PTR)addr, - (unsigned)sizeof(void*), mbi.RegionSize, state, type, prot); + addr_width(gdbctx), (DWORD_PTR)addr, + addr_width(gdbctx), mbi.RegionSize, state, type, prot); packet_reply_add(gdbctx, "O"); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx);

1 0

[PATCH] To: wine-devel@winehq.org
by Eric Pouech 02 Jul '21

02 Jul '21

winedbg: Added helper in gdbproxy mode to get proper address width information Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 19fa86d44da..89dcc14dcf6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -702,6 +702,13 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, * =============================================== * */ +static int addr_width(struct gdb_context* gdbctx) +{ + int sz = (gdbctx && gdbctx->process && gdbctx->process->be_cpu) ? + gdbctx->process->be_cpu->pointer_size : (int)sizeof(void*); + return sz * 2; +} + enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; @@ -1343,7 +1350,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); @@ -1468,8 +1475,8 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } packet_reply_open(gdbctx); snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n", - (unsigned)sizeof(void*), (DWORD_PTR)addr, - (unsigned)sizeof(void*), mbi.RegionSize, state, type, prot); + addr_width(gdbctx), (DWORD_PTR)addr, + addr_width(gdbctx), mbi.RegionSize, state, type, prot); packet_reply_add(gdbctx, "O"); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx);

1 0

[PATCH] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme 02 Jul '21

02 Jul '21

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2

1 0

[PATCH] To: wine-devel@winehq.org
by Eric Pouech 02 Jul '21

02 Jul '21

To: wine-devel(a)winehq.org winedbg: Added helper in gdbproxy mode to get proper address width information Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 19fa86d44da..89dcc14dcf6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -702,6 +702,13 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, * =============================================== * */ +static int addr_width(struct gdb_context* gdbctx) +{ + int sz = (gdbctx && gdbctx->process && gdbctx->process->be_cpu) ? + gdbctx->process->be_cpu->pointer_size : (int)sizeof(void*); + return sz * 2; +} + enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; @@ -1343,7 +1350,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); @@ -1468,8 +1475,8 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } packet_reply_open(gdbctx); snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n", - (unsigned)sizeof(void*), (DWORD_PTR)addr, - (unsigned)sizeof(void*), mbi.RegionSize, state, type, prot); + addr_width(gdbctx), (DWORD_PTR)addr, + addr_width(gdbctx), mbi.RegionSize, state, type, prot); packet_reply_add(gdbctx, "O"); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx);

1 0

[PATCH] winedbg: correct mapping read/write/execute information
by Eric Pouech 02 Jul '21

02 Jul '21

When processing memory related commands in winedbg, correctly report the bits from VirtualQueryEx. In details, + PAGE_WRITECOPY and PAGE_EXECUTE_WRITECOPY include read only access to the page. + PAGE_EXECUTE_WRITECOPY should report execution for the page. This patch covers 'info mem' in standard mode, and 'monitor mem' in gdbproxy mode. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 4 ++-- programs/winedbg/info.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 4aef27c3204..2fa88b612ff 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1459,13 +1459,13 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } memset(prot, ' ' , sizeof(prot)-1); prot[sizeof(prot)-1] = '\0'; - if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[0] = 'R'; if (mbi.AllocationProtect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) prot[1] = 'W'; if (mbi.AllocationProtect & (PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[1] = 'C'; - if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) prot[2] = 'X'; } else diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e1f3d269649..a6335092d84 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -769,13 +769,13 @@ void info_win32_virtual(DWORD pid) } memset(prot, ' ' , sizeof(prot) - 1); prot[sizeof(prot) - 1] = '\0'; - if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[0] = 'R'; if (mbi.AllocationProtect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) prot[1] = 'W'; if (mbi.AllocationProtect & (PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[1] = 'C'; - if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) prot[2] = 'X'; } else

1 0

[PATCH] winedbg: Fix crash when no process attached in 'info wnd' command
by Eric Pouech 02 Jul '21

02 Jul '21

Ensure that ADDRSIZE and ADDRWIDTH macros can be used even when WineDbg isn't attached to any process, by providing a default value. Use case: wine programs/winedbg/winedbg.exe.so info wnd was simply crashing. (fixes #BZ49625 https://bugs.winehq.org/show_bug.cgi?id=49625) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b7c765ac545..3733e1b410f 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -39,7 +39,7 @@ #include "oaidl.h" #include <wine/list.h> -#define ADDRSIZE (dbg_curr_process->be_cpu->pointer_size) +#define ADDRSIZE (dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : (int)sizeof(void*)) #define ADDRWIDTH (ADDRSIZE * 2) /* the debugger uses these exceptions for its internal use */

1 0

[PATCH] api-ms-win-core-featurestaging-l1-1-0: Add DLL
by Alex Henrie 02 Jul '21

02 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51329 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- configure.ac | 1 + dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-featurestaging-l1-1-0.spec | 5 +++++ tools/make_specfiles | 4 ++++ 4 files changed, 11 insertions(+) create mode 100644 dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec diff --git a/configure.ac b/configure.ac index f0a42cf3b0a..7102e95d2be 100644 --- a/configure.ac +++ b/configure.ac @@ -2762,6 +2762,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-3) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-featurestaging-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-ansi-l2-1-0) diff --git a/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in b/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in new file mode 100644 index 00000000000..cb2eb1c8d56 --- /dev/null +++ b/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-featurestaging-l1-1-0.dll diff --git a/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec new file mode 100644 index 00000000000..ab5127b7dfd --- /dev/null +++ b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stub GetFeatureEnabledState +@ stub RecordFeatureError +@ stub RecordFeatureUsage +@ stub SubscribeFeatureStateChangeNotification +@ stub UnsubscribeFeatureStateChangeNotification diff --git a/tools/make_specfiles b/tools/make_specfiles index e6a831025c6..d782beb27d7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -355,6 +355,10 @@ my @dll_groups = "secur32", "sspicli", ], + [ + "shcore", + "api-ms-win-core-featurestaging-l1-1-0", + ], [ "shcore", "shell32", -- 2.32.0.94.ge083fb24f6

1 0

[PATCH] winecfg: Don't convert font height to points when saving system font metrics.
by Zhiyi Zhang 02 Jul '21

02 Jul '21

Fix tooltip font size becomes smaller after clicking the apply button in Desktop Integration tab. For example, the original non-client area tooltip font lfHeight is -11. 11 pixels is 8 points in 96 DPI. Setting font size to 8 points to SPI_SETNONCLIENTMETRICS will make SPI_GETNONCLIENTMETRICS report lfHeight as 8. With lfHeight being 8, CreateFontIndirectW() creates a smaller font. This behavior is added by 5b8fdb9. I assume the intention was to save font size in a DPI-independent way. However, when lfHeight is negative, lfHeight will still be scaled back to 96 DPI before saving it to registry and scaled to system DPI when it's read from registry. So I think converting to points is unnecessary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/theme.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 687ea571311..e204a911516 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1035,12 +1035,6 @@ static void apply_sysparams(void) ncm.lfStatusFont = metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf; ncm.lfMessageFont = metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf; - ncm.lfMenuFont.lfHeight = MulDiv( ncm.lfMenuFont.lfHeight, -72, dpi ); - ncm.lfCaptionFont.lfHeight = MulDiv( ncm.lfCaptionFont.lfHeight, -72, dpi ); - ncm.lfStatusFont.lfHeight = MulDiv( ncm.lfStatusFont.lfHeight, -72, dpi ); - ncm.lfMessageFont.lfHeight = MulDiv( ncm.lfMessageFont.lfHeight, -72, dpi ); - ncm.lfSmCaptionFont.lfHeight = MulDiv( ncm.lfSmCaptionFont.lfHeight, -72, dpi ); - SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); -- 2.30.2

1 0

[PATCH 2/2] uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme().
by Zhiyi Zhang 02 Jul '21

02 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51348 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 2 +- dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 33e407fdf82..b18794740a8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -698,7 +698,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); if(SUCCEEDED(hr)) - UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); + SendMessageW(hwnd, WM_THEMECHANGED, 0, 0); return hr; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 38cccb3ec6f..7f2e6d04aa4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -233,8 +233,8 @@ static void test_SetWindowTheme(void) } DispatchMessageA(&msg); } - ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", TRUE); - ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", FALSE); + ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", FALSE); DestroyWindow(hWnd); UnregisterClassA("TestSetWindowThemeParentClass", GetModuleHandleA(0)); UnregisterClassA("TestSetWindowThemeChildClass", GetModuleHandleA(0)); -- 2.30.2

1 0

[PATCH 1/2] uxtheme: Test that SetWindowTheme() should send WM_THEMECHANGED instead of posting it.
by Zhiyi Zhang 02 Jul '21

02 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/msg.h | 409 ++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 138 +++++++++++- 2 files changed, 545 insertions(+), 2 deletions(-) create mode 100644 dlls/uxtheme/tests/msg.h diff --git a/dlls/uxtheme/tests/msg.h b/dlls/uxtheme/tests/msg.h new file mode 100644 index 00000000000..1be05499fd4 --- /dev/null +++ b/dlls/uxtheme/tests/msg.h @@ -0,0 +1,409 @@ +/* Message Sequence Testing Code + * + * Copyright (C) 2007 James Hawkins + * Copyright (C) 2007 Lei Zhang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <windows.h> +#include "wine/heap.h" +#include "wine/test.h" + +/* undocumented SWP flags - from SDK 3.1 */ +#define SWP_NOCLIENTSIZE 0x0800 +#define SWP_NOCLIENTMOVE 0x1000 + +typedef enum +{ + sent = 0x1, + posted = 0x2, + parent = 0x4, + wparam = 0x8, + lparam = 0x10, + defwinproc = 0x20, + beginpaint = 0x40, + optional = 0x80, + hook = 0x100, + winevent_hook =0x200, + id = 0x400, + custdraw = 0x800 +} msg_flags_t; + +struct message +{ + UINT message; /* the WM_* code */ + msg_flags_t flags; /* message props */ + WPARAM wParam; /* expected value of wParam */ + LPARAM lParam; /* expected value of lParam */ + UINT id; /* extra message data: id of the window, + notify code etc. */ + DWORD stage; /* custom draw stage */ +}; + +struct msg_sequence +{ + int count; + int size; + struct message *sequence; +}; + +static void add_message(struct msg_sequence **seq, int sequence_index, + const struct message *msg) +{ + struct msg_sequence *msg_seq = seq[sequence_index]; + + if (!msg_seq->sequence) + { + msg_seq->size = 10; + msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (*msg_seq->sequence)); + } + + if (msg_seq->count == msg_seq->size) + { + msg_seq->size *= 2; + msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (*msg_seq->sequence)); + } + + assert(msg_seq->sequence); + + msg_seq->sequence[msg_seq->count] = *msg; + msg_seq->count++; +} + +static inline void flush_sequence(struct msg_sequence **seg, int sequence_index) +{ + struct msg_sequence *msg_seq = seg[sequence_index]; + heap_free(msg_seq->sequence); + msg_seq->sequence = NULL; + msg_seq->count = msg_seq->size = 0; +} + +static inline void flush_sequences(struct msg_sequence **seq, int n) +{ + int i; + + for (i = 0; i < n; i++) + flush_sequence(seq, i); +} + +static void dump_sequence( struct msg_sequence **seq, int sequence_index, + const struct message *expected, const char *context, + const char *file, int line ) +{ + struct msg_sequence *msg_seq = seq[sequence_index]; + const struct message *actual, *sequence; + unsigned int count = 0; + + sequence = msg_seq->sequence; + actual = sequence; + + trace_(file, line)("Failed sequence %s:\n", context ); + while (expected->message && actual->message) + { + trace_(file, line)( " %u: expected: %04x - actual: %04x wp %08lx lp %08lx\n", + count, expected->message, actual->message, actual->wParam, actual->lParam ); + + if (expected->message == actual->message) + { + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + } + else + { + expected++; + actual++; + } + } + else + { + expected++; + actual++; + } + count++; + } + + /* optional trailing messages */ + while (expected->message && expected->flags & optional) + { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + expected++; + count++; + } + + if (expected->message) + { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + return; + } + + while (actual->message) + { + trace_(file, line)( " %u: expected: nothing - actual: %04x wp %08lx lp %08lx\n", + count, actual->message, actual->wParam, actual->lParam ); + actual++; + count++; + } +} + +static void ok_sequence_(struct msg_sequence **seq, int sequence_index, + const struct message *expected_list, const char *context, BOOL todo, + const char *file, int line) +{ + static const struct message end_of_sequence = {0, 0, 0, 0}; + struct msg_sequence *msg_seq = seq[sequence_index]; + const struct message *expected = expected_list; + const struct message *actual, *sequence; + int failcount = 0, dump = 0; + + add_message(seq, sequence_index, &end_of_sequence); + + sequence = msg_seq->sequence; + actual = sequence; + + while (expected->message && actual->message) + { + if (expected->message == actual->message) + { + if (expected->flags & wparam) + { + if (expected->wParam != actual->wParam && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", + context, expected->message, expected->wParam, actual->wParam); + } + } + else + { + ok_(file, line) (expected->wParam == actual->wParam, + "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", + context, expected->message, expected->wParam, actual->wParam); + if (expected->wParam != actual->wParam) dump++; + } + } + + if (expected->flags & lparam) + { + if (expected->lParam != actual->lParam && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", + context, expected->message, expected->lParam, actual->lParam); + } + } + else + { + ok_(file, line) (expected->lParam == actual->lParam, + "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", + context, expected->message, expected->lParam, actual->lParam); + if (expected->lParam != actual->lParam) dump++; + } + } + + if (expected->flags & custdraw) + { + if (expected->stage != actual->stage && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + } + } + else + { + ok_(file, line) (expected->stage == actual->stage, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + if (expected->stage != actual->stage) dump++; + } + } + + if (expected->flags & id) + { + if (expected->id != actual->id && expected->flags & optional) + { + expected++; + continue; + } + if (expected->id != actual->id && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + context, expected->message, expected->id, actual->id); + } + } + else + { + ok_(file, line) (expected->id == actual->id, + "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + context, expected->message, expected->id, actual->id); + if (expected->id != actual->id) dump++; + } + } + + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n", + context, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + } + } + else + { + ok_(file, line) ((expected->flags & defwinproc) == (actual->flags & defwinproc), + "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n", + context, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + if ((expected->flags & defwinproc) != (actual->flags & defwinproc)) dump++; + } + + ok_(file, line) ((expected->flags & beginpaint) == (actual->flags & beginpaint), + "%s: the msg 0x%04x should %shave been sent by BeginPaint\n", + context, expected->message, (expected->flags & beginpaint) ? "" : "NOT "); + if ((expected->flags & beginpaint) != (actual->flags & beginpaint)) dump++; + + if (((expected->flags & (sent|posted)) != (actual->flags & (sent|posted))) && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: the msg 0x%04x should have been %s\n", + context, expected->message, (expected->flags & posted) ? "posted" : "sent"); + } + } + else + { + ok_(file, line) ((expected->flags & (sent|posted)) == (actual->flags & (sent|posted)), + "%s: the msg 0x%04x should have been %s\n", + context, expected->message, (expected->flags & posted) ? "posted" : "sent"); + if ((expected->flags & (sent|posted)) != (actual->flags & (sent|posted))) dump++; + } + + ok_(file, line) ((expected->flags & parent) == (actual->flags & parent), + "%s: the msg 0x%04x was expected in %s\n", + context, expected->message, (expected->flags & parent) ? "parent" : "child"); + if ((expected->flags & parent) != (actual->flags & parent)) dump++; + + ok_(file, line) ((expected->flags & hook) == (actual->flags & hook), + "%s: the msg 0x%04x should have been sent by a hook\n", + context, expected->message); + if ((expected->flags & hook) != (actual->flags & hook)) dump++; + + ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), + "%s: the msg 0x%04x should have been sent by a winevent hook\n", + context, expected->message); + if ((expected->flags & winevent_hook) != (actual->flags & winevent_hook)) dump++; + + expected++; + actual++; + } + else if (expected->flags & optional) + expected++; + else if (todo) + { + failcount++; + dump++; + todo_wine + { + ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, expected->message, actual->message); + } + goto done; + } + else + { + ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, expected->message, actual->message); + dump++; + expected++; + actual++; + } + } + + /* skip all optional trailing messages */ + while (expected->message && ((expected->flags & optional))) + expected++; + + if (todo) + { + todo_wine + { + if (expected->message || actual->message) + { + failcount++; + dump++; + ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n", + context, expected->message, actual->message); + } + } + } + else if (expected->message || actual->message) + { + dump++; + ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n", + context, expected->message, actual->message); + } + + if(todo && !failcount) /* succeeded yet marked todo */ + { + if (!strcmp(winetest_platform, "wine")) dump++; + todo_wine + { + ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + } + } + +done: + if (dump) dump_sequence( seq, sequence_index, expected_list, context, file, line ); + flush_sequence(seq, sequence_index); +} + +#define ok_sequence(seq, index, exp, contx, todo) \ + ok_sequence_(seq, index, (exp), (contx), (todo), __FILE__, __LINE__) + + +static void init_msg_sequences(struct msg_sequence **seq, int n) +{ + int i; + + for (i = 0; i < n; i++) + seq[i] = heap_alloc_zero(sizeof(*seq[i])); +} diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 869dbe2cdc9..38cccb3ec6f 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -24,6 +24,7 @@ #include "vfwmsgs.h" #include "uxtheme.h" +#include "msg.h" #include "wine/test.h" static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); @@ -35,6 +36,16 @@ static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); +/* For message tests */ +enum seq_index +{ + PARENT_SEQ_INDEX, + CHILD_SEQ_INDEX, + NUM_MSG_SEQUENCES +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + static void init_funcs(void) { HMODULE hUxtheme = GetModuleHandleA("uxtheme.dll"); @@ -53,6 +64,72 @@ static void init_funcs(void) #undef UXTHEME_GET_PROC } +/* Try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + +static LRESULT WINAPI TestSetWindowThemeParentProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter; + struct message msg = {0}; + LRESULT ret; + + /* Only care about WM_THEMECHANGED */ + if (message != WM_THEMECHANGED) + return DefWindowProcA(hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + + InterlockedIncrement(&defwndproc_counter); + ret = DefWindowProcA(hwnd, message, wParam, lParam); + InterlockedDecrement(&defwndproc_counter); + return ret; +} + +static LRESULT WINAPI TestSetWindowThemeChildProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter; + struct message msg = {0}; + LRESULT ret; + + /* Only care about WM_THEMECHANGED */ + if (message != WM_THEMECHANGED) + return DefWindowProcA(hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + + InterlockedIncrement(&defwndproc_counter); + ret = DefWindowProcA(hwnd, message, wParam, lParam); + InterlockedDecrement(&defwndproc_counter); + return ret; +} + static void test_IsThemed(void) { BOOL bThemeActive; @@ -97,15 +174,71 @@ static void test_GetWindowTheme(void) DestroyWindow(hWnd); } +static const struct message SetWindowThemeSeq[] = +{ + {WM_THEMECHANGED, sent}, + {0} +}; + +static const struct message EmptySeq[] = +{ + {0} +}; + static void test_SetWindowTheme(void) { - HTHEME hTheme; + WNDCLASSA cls = {0}; + HWND hWnd, child; + HTHEME hTheme; HRESULT hRes; - HWND hWnd; + MSG msg; hRes = SetWindowTheme(NULL, NULL, NULL); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + /* Test that WM_THEMECHANGED is sent and not posted to windows */ + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpfnWndProc = TestSetWindowThemeParentProcA; + cls.lpszClassName = "TestSetWindowThemeParentClass"; + RegisterClassA(&cls); + + cls.lpfnWndProc = TestSetWindowThemeChildProcA; + cls.lpszClassName = "TestSetWindowThemeChildClass"; + RegisterClassA(&cls); + + hWnd = CreateWindowA("TestSetWindowThemeParentClass", "parent", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + ok(!!hWnd, "Failed to create a parent window.\n"); + child = CreateWindowA("TestSetWindowThemeChildClass", "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, + 50, hWnd, 0, 0, NULL); + ok(!!child, "Failed to create a child window.\n"); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hRes = SetWindowTheme(hWnd, NULL, NULL); + ok(hRes == S_OK, "Expected %#x, got %#x.\n", S_OK, hRes); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + struct message recv_msg = {0}; + + if (msg.message == WM_THEMECHANGED) + { + recv_msg.message = msg.message; + recv_msg.flags = posted | wparam | lparam; + recv_msg.wParam = msg.wParam; + recv_msg.lParam = msg.lParam; + add_message(sequences, msg.hwnd == hWnd ? PARENT_SEQ_INDEX : CHILD_SEQ_INDEX, &recv_msg); + } + DispatchMessageA(&msg); + } + ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", TRUE); + ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", TRUE); + DestroyWindow(hWnd); + UnregisterClassA("TestSetWindowThemeParentClass", GetModuleHandleA(0)); + UnregisterClassA("TestSetWindowThemeChildClass", GetModuleHandleA(0)); + /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "button", "test", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); ok(hWnd != NULL, "Failed to create a test window.\n"); @@ -697,6 +830,7 @@ todo_wine START_TEST(system) { init_funcs(); + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); /* No real functional theme API tests will be done (yet). The current tests * only show input/return behaviour -- 2.30.2

1 0

[PATCH 1/5] include: Add a helper macro to define wine AFD control codes.
by Zebediah Figura 01 Jul '21

01 Jul '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 82 ++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index c672168bc6a..5db8fb1f4de 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -140,46 +140,48 @@ struct afd_get_events_params NTSTATUS status[13]; }; -#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_CONNECT CTL_CODE(FILE_DEVICE_NETWORK, 203, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SHUTDOWN CTL_CODE(FILE_DEVICE_NETWORK, 204, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_RECVMSG CTL_CODE(FILE_DEVICE_NETWORK, 205, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SENDMSG CTL_CODE(FILE_DEVICE_NETWORK, 206, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_TRANSMIT CTL_CODE(FILE_DEVICE_NETWORK, 207, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 208, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_FIONBIO CTL_CODE(FILE_DEVICE_NETWORK, 209, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_COMPLETE_ASYNC CTL_CODE(FILE_DEVICE_NETWORK, 210, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_FIONREAD CTL_CODE(FILE_DEVICE_NETWORK, 211, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SIOCATMARK CTL_CODE(FILE_DEVICE_NETWORK, 212, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_INTERFACE_LIST CTL_CODE(FILE_DEVICE_NETWORK, 213, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_KEEPALIVE_VALS CTL_CODE(FILE_DEVICE_NETWORK, 214, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 235, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 236, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 237, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 238, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP CTL_CODE(FILE_DEVICE_NETWORK, 239, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define WINE_AFD_IOC(x) CTL_CODE(FILE_DEVICE_NETWORK, x, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_AFD_WINE_CREATE WINE_AFD_IOC(200) +#define IOCTL_AFD_WINE_ACCEPT WINE_AFD_IOC(201) +#define IOCTL_AFD_WINE_ACCEPT_INTO WINE_AFD_IOC(202) +#define IOCTL_AFD_WINE_CONNECT WINE_AFD_IOC(203) +#define IOCTL_AFD_WINE_SHUTDOWN WINE_AFD_IOC(204) +#define IOCTL_AFD_WINE_RECVMSG WINE_AFD_IOC(205) +#define IOCTL_AFD_WINE_SENDMSG WINE_AFD_IOC(206) +#define IOCTL_AFD_WINE_TRANSMIT WINE_AFD_IOC(207) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE WINE_AFD_IOC(208) +#define IOCTL_AFD_WINE_FIONBIO WINE_AFD_IOC(209) +#define IOCTL_AFD_WINE_COMPLETE_ASYNC WINE_AFD_IOC(210) +#define IOCTL_AFD_WINE_FIONREAD WINE_AFD_IOC(211) +#define IOCTL_AFD_WINE_SIOCATMARK WINE_AFD_IOC(212) +#define IOCTL_AFD_WINE_GET_INTERFACE_LIST WINE_AFD_IOC(213) +#define IOCTL_AFD_WINE_KEEPALIVE_VALS WINE_AFD_IOC(214) +#define IOCTL_AFD_WINE_MESSAGE_SELECT WINE_AFD_IOC(215) +#define IOCTL_AFD_WINE_GETPEERNAME WINE_AFD_IOC(216) +#define IOCTL_AFD_WINE_DEFER WINE_AFD_IOC(217) +#define IOCTL_AFD_WINE_GET_INFO WINE_AFD_IOC(218) +#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN WINE_AFD_IOC(219) +#define IOCTL_AFD_WINE_GET_SO_BROADCAST WINE_AFD_IOC(220) +#define IOCTL_AFD_WINE_SET_SO_BROADCAST WINE_AFD_IOC(221) +#define IOCTL_AFD_WINE_GET_SO_ERROR WINE_AFD_IOC(222) +#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE WINE_AFD_IOC(223) +#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE WINE_AFD_IOC(224) +#define IOCTL_AFD_WINE_GET_SO_LINGER WINE_AFD_IOC(225) +#define IOCTL_AFD_WINE_SET_SO_LINGER WINE_AFD_IOC(226) +#define IOCTL_AFD_WINE_GET_SO_OOBINLINE WINE_AFD_IOC(227) +#define IOCTL_AFD_WINE_SET_SO_OOBINLINE WINE_AFD_IOC(228) +#define IOCTL_AFD_WINE_SET_SO_RCVBUF WINE_AFD_IOC(229) +#define IOCTL_AFD_WINE_GET_SO_RCVBUF WINE_AFD_IOC(230) +#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO WINE_AFD_IOC(231) +#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO WINE_AFD_IOC(232) +#define IOCTL_AFD_WINE_GET_SO_REUSEADDR WINE_AFD_IOC(233) +#define IOCTL_AFD_WINE_SET_SO_REUSEADDR WINE_AFD_IOC(234) +#define IOCTL_AFD_WINE_SET_SO_SNDBUF WINE_AFD_IOC(235) +#define IOCTL_AFD_WINE_GET_SO_SNDBUF WINE_AFD_IOC(236) +#define IOCTL_AFD_WINE_GET_SO_SNDTIMEO WINE_AFD_IOC(237) +#define IOCTL_AFD_WINE_SET_SO_SNDTIMEO WINE_AFD_IOC(238) +#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP WINE_AFD_IOC(239) struct afd_create_params { -- 2.30.2

2 8

[PATCH v5 1/3] advapi32/tests: Add some test for perflib keys.
by Zebediah Figura 01 Jul '21

01 Jul '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/registry.c | 139 +++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 72423eae94c..cdf9b18f5d1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -99,6 +99,11 @@ static void InitFunctionPtrs(void) pNtUnloadKey = (void *)GetProcAddress( hntdll, "NtUnloadKey" ); } +static BOOL is_special_key(HKEY key) +{ + return !!((ULONG_PTR)key & 0x80000000); +} + /* delete key and all its subkeys */ static DWORD delete_key( HKEY hkey ) { @@ -3809,6 +3814,139 @@ todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); } +static void test_perflib_key(void) +{ + unsigned int primary_lang = PRIMARYLANGID(GetUserDefaultLangID()); + unsigned int buffer_size = 1024 * 1024; + OBJECT_NAME_INFORMATION *name_info; + HKEY perflib_key, key, key2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + char lang_name[4]; + char *buffer; + DWORD size; + LONG ret; + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); + ok(!ret, "got %u\n", ret); + + ret = RegOpenKeyExA(perflib_key, "009", 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + /* English always returns TEXT; most other languages return NLSTEXT, but + * some (e.g. Hindi) return TEXT */ + todo_wine ok(key == HKEY_PERFORMANCE_TEXT || key == HKEY_PERFORMANCE_NLSTEXT, "got key %p\n", key); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"009"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, perflib_key, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_ALL_ACCESS, &attr); + todo_wine ok(ret == STATUS_PREDEFINED_HANDLE || ret == STATUS_ACCESS_DENIED + || ret == STATUS_SUCCESS /* Win < 7 */, "got %#x\n", ret); + if (ret == STATUS_PREDEFINED_HANDLE) + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + else if (ret == STATUS_SUCCESS) + ok(key == HKEY_PERFORMANCE_TEXT, "got key %p\n", key); + else + { + skip("Not enough permissions to test the perflib key.\n"); + RegCloseKey(perflib_key); + return; + } + + buffer = malloc(buffer_size); + + ret = NtQueryKey(key, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateKey(key, 0, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"counter"); + ret = NtQueryValueKey(key, &string, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateValueKey(key, 0, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtSetValueKey(key, &string, 0, REG_SZ, "test", 5); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteValueKey(key, &string); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteKey(key); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"subkey"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, key, NULL); + ret = NtOpenKey((HANDLE *)&key2, KEY_READ, &attr); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(ret == STATUS_OBJECT_NAME_NOT_FOUND + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + + ret = NtCreateKey((HANDLE *)&key2, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret || broken(ret == STATUS_ACCESS_DENIED) /* w8adm */ + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + if (!ret) + { + NtDeleteKey(key2); + NtClose(key2); + } + + /* it's a real handle, though */ + ret = NtQueryObject(key, ObjectNameInformation, buffer, buffer_size, &size); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + if (!ret) + { + name_info = (OBJECT_NAME_INFORMATION *)buffer; + ok(!wcsicmp(name_info->Name.Buffer, L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT" + "\\CurrentVersion\\Perflib\\009"), "got name %s\n", debugstr_w(name_info->Name.Buffer)); + } + + ret = NtClose(key); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + + /* multilingual support was not really completely thought through */ + + sprintf(lang_name, "%03x", primary_lang); + if (primary_lang != LANG_ENGLISH) + { + ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + } + + ret = RegCloseKey(perflib_key); + ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"\\Registry\\PerfData"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_READ, &attr); + todo_wine ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret); + + free(buffer); +} + static void test_RegLoadMUIString(void) { HMODULE hUser32, hResDll, hFile; @@ -4213,6 +4351,7 @@ START_TEST(registry) test_RegQueryValueExPerformanceData(); test_RegLoadMUIString(); test_EnumDynamicTimeZoneInformation(); + test_perflib_key(); /* cleanup */ delete_key( hkey_main ); -- 2.30.2

1 2

Why did hid:device start timing out on May 24th?
by Francois Gouget 01 Jul '21

01 Jul '21

The failure pattern shows that hid:device started timing out about 20% of the time on the debiant2 VM on or about the 24th of May: https://test.winehq.org/data/patterns.html#hid:device debiant2 was last modified on 2021-05-11 so that's not it. There is no obviously related commit on that date. I tried bisecting for a commit by considering a commit good only if the test succeeds 25 times in a row. But that was inconclusive. Similarly I looked for another test interfering with hid:device (with the same repeat count), but that was inconclusive too. So does anyone have any idea what could have changed? Or better yet, have a fix for it? Note that the timeout seems to only impact the tests running in a non-English locale or a WoW Wine build. In other words anything that's not the plain 32-bit English Wine. That's strange too. -- Francois Gouget <fgouget(a)codeweavers.com>

2 2

[PATCH v3 2/4] d3dx10: Implement D3DX10CreateTextureFromMemory initially.
by Ziqing Hui 01 Jul '21

01 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 11 -- dlls/d3dx10_43/tests/d3dx10.c | 8 +- dlls/d3dx10_43/texture.c | 229 ++++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 16 deletions(-)

3 2

[PATCH v4 4/4] d3dx10: Support block compressed formats in D3DX10CreateTextureFromMemory().
by Matteo Bruni 01 Jul '21

01 Jul '21

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v4: Declare block_compressed_formats[] as const. dlls/d3dx10_43/tests/d3dx10.c | 4 +- dlls/d3dx10_43/texture.c | 87 ++++++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index d5d1f02441c..30d766bf244 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1147,6 +1147,8 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag { line_match = !memcmp(image->expected_data + stride * i, (BYTE *)map.pData + map.RowPitch * i, stride); + todo_wine_if(is_block_compressed(image->expected_info.Format) + && (image->expected_info.Width % 4 != 0 || image->expected_info.Height % 4 != 0)) ok_(__FILE__, line)(line_match, "Data mismatch for line %u.\n", i); if (!line_match) break; @@ -1997,7 +1999,7 @@ static void test_create_texture(void) winetest_push_context("Test %u", i); hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); - todo_wine_if(is_block_compressed(test_image[i].expected_info.Format)) + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) { diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8765f312f4c..8d30aef8648 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -71,6 +71,17 @@ wic_pixel_formats[] = { &GUID_WICPixelFormat128bppRGBAFloat, DXGI_FORMAT_R32G32B32A32_FLOAT } }; +static const DXGI_FORMAT block_compressed_formats[] = +{ + DXGI_FORMAT_BC1_TYPELESS, DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB, + DXGI_FORMAT_BC2_TYPELESS, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB, + DXGI_FORMAT_BC3_TYPELESS, DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB, + DXGI_FORMAT_BC4_TYPELESS, DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_BC4_SNORM, + DXGI_FORMAT_BC5_TYPELESS, DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_BC5_SNORM, + DXGI_FORMAT_BC6H_TYPELESS, DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_SF16, + DXGI_FORMAT_BC7_TYPELESS, DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB +}; + static const DXGI_FORMAT to_be_converted_format[] = { DXGI_FORMAT_UNKNOWN, @@ -124,6 +135,17 @@ static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimensio } } +static BOOL is_block_compressed(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(block_compressed_formats); ++i) + if (format == block_compressed_formats[i]) + return TRUE; + + return FALSE; +} + static unsigned int get_bpp_from_format(DXGI_FORMAT format) { switch (format) @@ -556,6 +578,7 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s { unsigned int frame_count, width, height, stride, frame_size; IWICFormatConverter *converter = NULL; + IWICDdsFrameDecode *dds_frame = NULL; D3D10_TEXTURE2D_DESC texture_2d_desc; D3D10_SUBRESOURCE_DATA resource_data; IWICBitmapFrameDecode *frame = NULL; @@ -582,6 +605,11 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s if (FAILED(D3DX10GetImageInfoFromMemory(src_data, src_data_size, NULL, &img_info, NULL))) return E_FAIL; + if (img_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) + { + FIXME("Cube map is not supported.\n"); + return E_FAIL; + } if (FAILED(hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto end; @@ -600,6 +628,11 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s width = img_info.Width; height = img_info.Height; + if (is_block_compressed(img_info.Format)) + { + width = (width + 3) & ~3; + height = (height + 3) & ~3; + } stride = (width * get_bpp_from_format(img_info.Format) + 7) / 8; frame_size = stride * height; @@ -609,35 +642,45 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s goto end; } - if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) + if (is_block_compressed(img_info.Format)) { - hr = E_FAIL; - FIXME("Unsupported DXGI format %#x.\n", img_info.Format); - goto end; - } - - if (IsEqualGUID(&src_format, dst_format)) - { - if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + if (FAILED(hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICDdsFrameDecode, (void **)&dds_frame))) + goto end; + if (FAILED(hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride * 4, frame_size, buffer))) goto end; } else { - if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) - goto end; - if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) - goto end; - if (!can_convert) + if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) { - WARN("Format converting %s to %s is not supported by WIC.\n", - debugstr_guid(&src_format), debugstr_guid(dst_format)); + hr = E_FAIL; + FIXME("Unsupported DXGI format %#x.\n", img_info.Format); goto end; } - if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, - WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) - goto end; - if (FAILED(hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer))) - goto end; + + if (IsEqualGUID(&src_format, dst_format)) + { + if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + goto end; + } + else + { + if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) + goto end; + if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) + goto end; + if (!can_convert) + { + WARN("Format converting %s to %s is not supported by WIC.\n", + debugstr_guid(&src_format), debugstr_guid(dst_format)); + goto end; + } + if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, + WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) + goto end; + if (FAILED(hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer))) + goto end; + } } memset(&texture_2d_desc, 0, sizeof(texture_2d_desc)); @@ -664,6 +707,8 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s end: if (converter) IWICFormatConverter_Release(converter); + if (dds_frame) + IWICDdsFrameDecode_Release(dds_frame); if (buffer) heap_free(buffer); if (frame) -- 2.26.3

1 0

[PATCH v3 3/4] d3dx10: Handle format converting for D3DX10CreateTextureFromMemory.
by Ziqing Hui 01 Jul '21

01 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/d3dx10_43/texture.c | 83 ++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 8 deletions(-)

2 1

[PATCH v3 1/4] d3dx10/tests: Test texture returned by D3DX10CreateTextureFromMemory on failure.
by Ziqing Hui 01 Jul '21

01 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Fix test failure. dlls/d3dx10_43/tests/d3dx10.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)

2 1

[tools] winetest: Remove the unused td.arrow CSS style.
by Francois Gouget 01 Jul '21

01 Jul '21

The up/down arrows are now positioned using the ralign class rather than a table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/report.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/report.css b/winetest/report.css index 80be53dbe..b558c6ff7 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -65,10 +65,6 @@ table.output td { text-align: left; } -td.arrow :link { color: #ffffff; text-decoration: none; } -td.arrow :visited { color: #ffffff; text-decoration: none; } -td.arrow :hover { color: #ffffff; text-decoration: underline; } - .ralign { display: inline-block; float: right; -- 2.20.1

1 0

[tools] winetest/gather: Truncated files are rejected.
by Francois Gouget 01 Jul '21

01 Jul '21

When a report size exceeds the size limit it is dropped so the corresponding summary.txt file will never contain "failed filelimit". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/gather | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/winetest/gather b/winetest/gather index 1e9b2da36..abb339598 100755 --- a/winetest/gather +++ b/winetest/gather @@ -108,8 +108,6 @@ sub short_date($) # group A reference to the group the report belongs to. # missing A hash of the reason why some test results are missing, # indexed by the test unit name. -# filelimit The name of the last test that was run before the report file -# size limit was reached. # <testname> Maps the test names to a structure containing the individual # unit test's results. Note that there's no name collision # with the other fields because the test names contain a ':'. @@ -349,9 +347,6 @@ foreach my $file (glob "$builddir/*/summary.txt") { if ($count eq "failed") { if ($todos eq "crash") { $report->{$testname} = { status => "crash" }; - } elsif ($todos eq "filelimit") { - $report->{$testname} = { status => "file limit" }; - $report->{filelimit} = $testname; } else { $report->{$testname} = { status => $todos }; } @@ -437,16 +432,12 @@ foreach my $group (@groups) { foreach my $report (@{$group->{reports}}) { if (!exists $report->{$testname}) { my ($dll, $unit) = split(/:/, $testname); - my $filelimit = $report->{filelimit}; if (exists $report->{missing}->{$dll}) { # Record the reason why this test is missing $report->{$testname} = { status => $report->{missing}->{$dll}, count => [ 1, 1 ], skips => [ 1, 1 ] }; - } elsif (defined $filelimit && $testname gt $filelimit) { - # Mark this test as missing because of a partial report file - $report->{$testname}->{status} = "truncated"; } else { # Mark this test as missing for an unknown reason (typically # the start & done lines where unrecognizable) @@ -650,7 +641,6 @@ sub get_result_title($$) if ($result->{status} eq "crash") { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } if ($result->{status} eq "skipped") { return "Skipped by user request"; } - if ($result->{status} eq "truncated") { return "The report was truncated"; } my ($dll, $unit) = split(/:/, $testname); $dll.=".dll" if ($dll !~ /\....?$/); @@ -737,7 +727,6 @@ sub singletest($$$) { crash => "crashed", 258 => "timeout", mixed => "mixed", - truncated => "truncated", ); $msg = $status2label{$status} || "unknown"; } -- 2.20.1

1 0

[tools] winetest/gather: Link 'test list' failures to the test's version page.
by Francois Gouget 01 Jul '21

01 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/gather | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/winetest/gather b/winetest/gather index e00077792..1e9b2da36 100755 --- a/winetest/gather +++ b/winetest/gather @@ -693,6 +693,12 @@ sub singletest($$$) { { $href = "$report->{dir}/$testname.html"; } + elsif (-r "$builddir/$report->{dir}/version.html") + { + my $dll = $testname; + $dll =~ s/:.*//; + $href = "$report->{dir}/version.html#$dll"; + } else { $href=""; -- 2.20.1

1 0

[tools] winetest/build-patterns: Show the list a test pattern is in.
by Francois Gouget 01 Jul '21

01 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index e3174b231..da7272e56 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -382,7 +382,6 @@ foreach my $build (@sortedbuilds) $tests{$testname} = $test = { id => $testname, name => $testname, - title => "<a href='tests/$testname.html'>$testname</a>", source => $source, }; $testsources{$source} = 1; @@ -1236,7 +1235,13 @@ sub write_patterns_list($$$$) my $test = $tests{$testname}; print $html "<div class='testfile' id='$test->{id}'>\n"; - print $html "<div class='updownbar'>$test->{title}"; + my $title = $test->{title}; + if (!$test->{title}) + { + my $tooltip = $list->{title} ? " title='$list->{title}'" : ""; + $title = "<a href='tests/$testname.html'$tooltip>$testname</a>"; + } + print $html "<div class='updownbar'>$title"; print $html "<div class='ralign'>"; if ($mainpage) { -- 2.20.1

1 0

[PATCH v2] hidclass.sys: Stop accepting IRPs after device removal.
by Rémi Bernon 01 Jul '21

01 Jul '21

Handle IRP_MN_SURPRISE_REMOVAL and notify device thread to stop it, but only wait for it in IRP_MN_REMOVE_DEVICE, as it's probably waiting for an IRP sent to the lower driver, which needs to be notified of removal too first. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 208887 dlls/hidclass.sys/device.c | 39 ++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 3 +++ dlls/hidclass.sys/pnp.c | 31 +++++++++++++++++++++--------- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 82366ad1888..d3f5fa90fc7 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -431,11 +431,24 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) NTSTATUS rc = STATUS_SUCCESS; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + BOOL removed; + KIRQL irql; irp->IoStatus.Information = 0; TRACE("device %p ioctl(%x)\n", device, irpsp->Parameters.DeviceIoControl.IoControlCode); + KeAcquireSpinLock(&ext->u.pdo.lock, &irql); + removed = ext->u.pdo.removed; + KeReleaseSpinLock(&ext->u.pdo.lock, irql); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_HID_GET_POLL_FREQUENCY_MSEC: @@ -588,6 +601,19 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) NTSTATUS rc = STATUS_SUCCESS; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); int ptr = -1; + BOOL removed; + KIRQL irql; + + KeAcquireSpinLock(&ext->u.pdo.lock, &irql); + removed = ext->u.pdo.removed; + KeReleaseSpinLock(&ext->u.pdo.lock, irql); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } packet = malloc(buffer_size); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); @@ -662,7 +688,20 @@ NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; HID_XFER_PACKET packet; ULONG max_len; + BOOL removed; NTSTATUS rc; + KIRQL irql; + + KeAcquireSpinLock(&ext->u.pdo.lock, &irql); + removed = ext->u.pdo.removed; + KeReleaseSpinLock(&ext->u.pdo.lock, irql); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } irp->IoStatus.Information = 0; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 5a502840691..19ac7091065 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -67,6 +67,9 @@ typedef struct _BASE_DEVICE_EXTENSION KSPIN_LOCK irp_queue_lock; LIST_ENTRY irp_queue; + KSPIN_LOCK lock; + BOOL removed; + BOOL is_mouse; UNICODE_STRING mouse_link_name; BOOL is_keyboard; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5f59257cdf7..2f5fe5de4eb 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -359,11 +359,23 @@ static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp) } } +static void remove_pending_irps(BASE_DEVICE_EXTENSION *ext) +{ + IRP *irp; + + while ((irp = pop_irp_from_queue(ext))) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } +} + static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; NTSTATUS status = irp->IoStatus.Status; + KIRQL irql; TRACE("irp %p, minor function %#x.\n", irp, irpsp->MinorFunction); @@ -453,12 +465,13 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) IoSetDeviceInterfaceState(&ext->u.pdo.mouse_link_name, TRUE); if (ext->u.pdo.is_keyboard) IoSetDeviceInterfaceState(&ext->u.pdo.keyboard_link_name, TRUE); + + ext->u.pdo.removed = FALSE; status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE: - { - IRP *queued_irp; + remove_pending_irps(ext); send_wm_input_device_change(ext, GIDC_REMOVAL); @@ -479,21 +492,21 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) if (ext->u.pdo.ring_buffer) RingBuffer_Destroy(ext->u.pdo.ring_buffer); - while ((queued_irp = pop_irp_from_queue(ext))) - { - queued_irp->IoStatus.Status = STATUS_DEVICE_REMOVED; - IoCompleteRequest(queued_irp, IO_NO_INCREMENT); - } - RtlFreeUnicodeString(&ext->u.pdo.link_name); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); IoDeleteDevice(device); return STATUS_SUCCESS; - } case IRP_MN_SURPRISE_REMOVAL: + KeAcquireSpinLock(&ext->u.pdo.lock, &irql); + ext->u.pdo.removed = TRUE; + KeReleaseSpinLock(&ext->u.pdo.lock, irql); + + remove_pending_irps(ext); + + SetEvent(ext->u.pdo.halt_event); status = STATUS_SUCCESS; break; -- 2.32.0

2 1

[PATCH v3 1/6] wined3d: Introduce a prepare_upload_bo device context operation and use it to upload sub-resource data.
by Zebediah Figura 01 Jul '21

01 Jul '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: fix the return value of wined3d_deferred_context_prepare_upload_bo dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cs.c | 54 ++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 3 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 ++++ 5 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9d22a909fb6..4c5e2054fe0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1063,7 +1063,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, if (buffer->flags & WINED3D_BUFFER_USE_BO) { wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - device->cs->c.ops->update_sub_resource(&device->cs->c, resource, + wined3d_device_context_emit_update_sub_resource(&device->cs->c, resource, 0, &box, data->data, data->row_pitch, data->slice_pitch); } else diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 47bc36d4cc0..700ff17ee96 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2649,6 +2649,40 @@ done: wined3d_resource_release(resource); } +void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch) +{ + struct wined3d_const_bo_address src_addr; + void *map_ptr; + + if ((map_ptr = context->ops->prepare_upload_bo(context, resource, sub_resource_idx, box, + row_pitch, slice_pitch, WINED3D_MAP_WRITE, &src_addr))) + { + struct wined3d_cs_update_sub_resource *op; + + wined3d_format_copy_data(resource->format, data, row_pitch, slice_pitch, map_ptr, row_pitch, slice_pitch, + box->right - box->left, box->bottom - box->top, box->back - box->front); + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; + op->resource = resource; + op->sub_resource_idx = sub_resource_idx; + op->box = *box; + op->addr = src_addr; + op->row_pitch = row_pitch; + op->slice_pitch = slice_pitch; + + wined3d_device_context_acquire_resource(context, resource); + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); + } + else + { + context->ops->update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, slice_pitch); + } +} + static void wined3d_cs_update_sub_resource(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int slice_pitch) @@ -2946,12 +2980,21 @@ static void wined3d_cs_st_finish(struct wined3d_device_context *context, enum wi { } +static void *wined3d_cs_prepare_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box, unsigned int row_pitch, + unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address) +{ + /* FIXME: We would like to return mapped or newly allocated memory here. */ + return NULL; +} + static const struct wined3d_device_context_ops wined3d_cs_st_ops = { wined3d_cs_st_require_space, wined3d_cs_st_submit, wined3d_cs_st_finish, wined3d_cs_st_push_constants, + wined3d_cs_prepare_upload_bo, wined3d_cs_map, wined3d_cs_unmap, wined3d_cs_update_sub_resource, @@ -3080,6 +3123,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_submit, wined3d_cs_mt_finish, wined3d_cs_mt_push_constants, + wined3d_cs_prepare_upload_bo, wined3d_cs_map, wined3d_cs_unmap, wined3d_cs_update_sub_resource, @@ -3353,6 +3397,15 @@ static void wined3d_deferred_context_push_constants(struct wined3d_device_contex FIXME("context %p, p %#x, start_idx %u, count %u, constants %p, stub!\n", context, p, start_idx, count, constants); } +static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + unsigned int row_pitch, unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address) +{ + FIXME("context %p, resource %p, sub_resource_idx %u, box %p, flags %#x, address %p, stub!\n", + context, resource, sub_resource_idx, box, flags, address); + return NULL; +} + static HRESULT wined3d_deferred_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags) { @@ -3430,6 +3483,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_submit, wined3d_deferred_context_finish, wined3d_deferred_context_push_constants, + wined3d_deferred_context_prepare_upload_bo, wined3d_deferred_context_map, wined3d_deferred_context_unmap, wined3d_deferred_context_update_sub_resource, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96657141419..e37bf46594c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4679,7 +4679,8 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont return; } - context->ops->update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); + wined3d_device_context_emit_update_sub_resource(context, resource, + sub_resource_idx, box, data, row_pitch, depth_pitch); } void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 62f38a1d592..c1247fbc56b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4350,7 +4350,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { wined3d_texture_get_level_box(*texture, i % (*texture)->level_count, &box); - device->cs->c.ops->update_sub_resource(&device->cs->c, &(*texture)->resource, + wined3d_device_context_emit_update_sub_resource(&device->cs->c, &(*texture)->resource, i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c70b0f7c338..83a0a48471b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4704,6 +4704,9 @@ struct wined3d_device_context_ops void (*finish)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); void (*push_constants)(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants); + void *(*prepare_upload_bo)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box, unsigned int row_pitch, + unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address); HRESULT (*map)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags); HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, @@ -4855,6 +4858,9 @@ void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_co struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) { -- 2.30.2

5 16

[PATCH 1/5] wineusb.sys: Introduce new remove_pending_irps helper.
by Rémi Bernon 01 Jul '21

01 Jul '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wineusb.sys/wineusb.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b8cefdaff5e..8fb1d75f121 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -363,6 +363,20 @@ static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID return STATUS_SUCCESS; } +static void remove_pending_irps(struct usb_device *device) +{ + LIST_ENTRY *entry; + IRP *irp; + + while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) + { + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp->IoStatus.Status = STATUS_DELETE_PENDING; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } +} + static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -393,17 +407,8 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) break; case IRP_MN_REMOVE_DEVICE: - { - LIST_ENTRY *entry; - EnterCriticalSection(&wineusb_cs); - while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) - { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - irp->IoStatus.Status = STATUS_DELETE_PENDING; - irp->IoStatus.Information = 0; - IoCompleteRequest(irp, IO_NO_INCREMENT); - } + remove_pending_irps(device); LeaveCriticalSection(&wineusb_cs); if (device->removed) @@ -419,7 +424,6 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) ret = STATUS_SUCCESS; break; - } default: FIXME("Unhandled minor function %#x.\n", stack->MinorFunction); -- 2.32.0

2 11

[PATCH 1/2] amstream/tests: Clarify flags passed to IAMMultiMediaStream::OpenFile().
by Gijs Vermeulen 01 Jul '21

01 Jul '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index db2d6e977ca..1480f723a1c 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -462,7 +462,7 @@ static void test_openfile(const WCHAR *test_avi_path) check_interface(filter, &IID_IMediaSeeking, FALSE); - hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_RENDERTOEXISTING); ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); check_interface(filter, &IID_IMediaSeeking, FALSE); @@ -489,7 +489,7 @@ static void test_openfile(const WCHAR *test_avi_path) check_interface(filter, &IID_IMediaSeeking, FALSE); - hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_RENDERTOEXISTING); ok(hr == S_OK, "Got hr %#x.\n", hr); check_interface(filter, &IID_IMediaSeeking, TRUE); @@ -585,7 +585,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); audio_hr = hr; - hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_RENDERTOEXISTING); ok(hr == S_OK, "Got hr %#x.\n", hr); duration = 0xdeadbeefdeadbeefULL; @@ -618,7 +618,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) mmstream = create_ammultimediastream(); - hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_RENDERTOEXISTING); ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); duration = 0xdeadbeefdeadbeefULL; @@ -1778,7 +1778,7 @@ static void test_media_streams(void) } /* Test open file with no filename */ - hr = IAMMultiMediaStream_OpenFile(pams, NULL, 0); + hr = IAMMultiMediaStream_OpenFile(pams, NULL, AMMSF_RENDERTOEXISTING); ok(hr == E_POINTER, "IAMMultiMediaStream_OpenFile returned %x instead of %x\n", hr, E_POINTER); if (video_stream) -- 2.32.0

2 4

[PATCH 1/5] dxgi/tests: Add a test for swapchain present counts.
by Henri Verbeet 01 Jul '21

01 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 91 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 0d3caa61783..75dbf56f995 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -908,6 +908,38 @@ static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d return adapter; } +#define create_swapchain(a, b, c) create_swapchain_(__LINE__, a, b, c) +static IDXGISwapChain *create_swapchain_(unsigned int line, IUnknown *device, BOOL is_d3d12, HWND window) +{ + DXGI_SWAP_CHAIN_DESC desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + HRESULT hr; + + desc.BufferDesc.Width = 640; + desc.BufferDesc.Height = 480; + desc.BufferDesc.RefreshRate.Numerator = 60; + desc.BufferDesc.RefreshRate.Denominator = 1; + desc.BufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc.BufferCount = is_d3d12 ? 2 : 1; + desc.OutputWindow = window; + desc.Windowed = TRUE; + desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + desc.Flags = 0; + + get_factory(device, is_d3d12, &factory); + hr = IDXGIFactory_CreateSwapChain(factory, device, &desc, &swapchain); + ok_(__FILE__, line)(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + IDXGIFactory_Release(factory); + + return swapchain; +} + static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -7432,6 +7464,63 @@ done: heap_free(original_modes); } +static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) +{ + UINT present_count, expected; + IDXGISwapChain *swapchain; + HWND window; + HRESULT hr; + + window = create_window(); + swapchain = create_swapchain(device, is_d3d12, window); + + present_count = ~0u; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!present_count, "Got unexpected present count %u.\n", present_count); + + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count + 1; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + hr = IDXGISwapChain_Present(swapchain, 10, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + expected = present_count; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + ShowWindow(window, SW_MINIMIZE); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); + expected = present_count + !!is_d3d12; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + ShowWindow(window, SW_NORMAL); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count + 1; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + IDXGISwapChain_Release(swapchain); + DestroyWindow(window); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -7549,6 +7638,7 @@ START_TEST(dxgi) run_on_d3d10(test_window_association); run_on_d3d10(test_default_fullscreen_target_output); run_on_d3d10(test_mode_change); + run_on_d3d10(test_swapchain_present_count); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7579,6 +7669,7 @@ START_TEST(dxgi) run_on_d3d12(test_window_association); run_on_d3d12(test_default_fullscreen_target_output); run_on_d3d12(test_mode_change); + run_on_d3d12(test_swapchain_present_count); FreeLibrary(d3d12_module); } -- 2.20.1

2 1

[PATCH 5/5] wined3d: Only set valid transform states in wined3d_device_context_set_state().
by Henri Verbeet 01 Jul '21

01 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4aaaee75c93..701041962e5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1750,7 +1750,8 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte for (i = 0; i < WINED3D_HIGHEST_TRANSFORM_STATE + 1; ++i) { - wined3d_device_context_emit_set_transform(context, i, state->transforms + i); + if (context->device->state_table[STATE_TRANSFORM(i)].representative) + wined3d_device_context_emit_set_transform(context, i, state->transforms + i); } for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) -- 2.20.1

1 0

[PATCH 4/5] wined3d: Only set valid render states in wined3d_device_context_set_state().
by Henri Verbeet 01 Jul '21

01 Jul '21

Somewhat similar to commit 0170bb0e548d33e4fa014b73cd2c75ce7ea0dc82, setting invalid render states ends up invalidating invalid state IDs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96657141419..4aaaee75c93 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1774,7 +1774,8 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte for (i = 0; i < WINEHIGHEST_RENDER_STATE + 1; ++i) { - wined3d_device_context_emit_set_render_state(context, i, state->render_states[i]); + if (context->device->state_table[STATE_RENDER(i)].representative) + wined3d_device_context_emit_set_render_state(context, i, state->render_states[i]); } wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); -- 2.20.1

1 0

[PATCH 3/5] dxgi: Implement d3d12_swapchain_GetLastPresentCount().
by Henri Verbeet 01 Jul '21

01 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 11 +++++++---- dlls/dxgi/tests/dxgi.c | 23 ++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a2a85f75bac..5df483f2615 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2179,10 +2179,9 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return hresult_from_vk_result(vr); } + ++swapchain->frame_number; if ((frame_latency_event = swapchain->frame_latency_event)) { - ++swapchain->frame_number; - if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue, swapchain->frame_latency_fence, swapchain->frame_number))) { @@ -2505,9 +2504,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFrameStatistics(IDXGISwapCha static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetLastPresentCount(IDXGISwapChain4 *iface, UINT *last_present_count) { - FIXME("iface %p, last_present_count %p stub!\n", iface, last_present_count); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); - return E_NOTIMPL; + TRACE("iface %p, last_present_count %p.\n", iface, last_present_count); + + *last_present_count = swapchain->frame_number; + + return S_OK; } /* IDXGISwapChain1 methods */ diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 1e5f9d9cb22..7a4204c61b5 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7476,29 +7476,28 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) present_count = ~0u; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!present_count, "Got unexpected present count %u.\n", present_count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!present_count, "Got unexpected present count %u.\n", present_count); hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) - ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 10, 0); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_MINIMIZE); @@ -7506,18 +7505,16 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); expected = present_count + !!is_d3d12; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) - ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_NORMAL); hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) - ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); IDXGISwapChain_Release(swapchain); DestroyWindow(window); -- 2.20.1

1 0

[PATCH 2/5] dxgi: Implement d3d11_swapchain_GetLastPresentCount().
by Henri Verbeet 01 Jul '21

01 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 14 +++++++++++--- dlls/dxgi/tests/dxgi.c | 20 +++++++++++--------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 34e53af2138..b3cd1164b90 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -182,6 +182,7 @@ struct d3d11_swapchain IWineDXGIFactory *factory; IDXGIOutput *target; + LONG present_count; }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5b3ca5b5762..a2a85f75bac 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -328,6 +328,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDevice(IDXGISwapChain1 *ifac static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, unsigned int sync_interval, unsigned int flags) { + HRESULT hr; + if (sync_interval > 4) { WARN("Invalid sync interval %u.\n", sync_interval); @@ -345,7 +347,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return S_OK; } - return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); + if (SUCCEEDED(hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0))) + InterlockedIncrement(&swapchain->present_count); + return hr; } static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) @@ -599,9 +603,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapCha static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetLastPresentCount(IDXGISwapChain1 *iface, UINT *last_present_count) { - FIXME("iface %p, last_present_count %p stub!\n", iface, last_present_count); + struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - return E_NOTIMPL; + TRACE("iface %p, last_present_count %p.\n", iface, last_present_count); + + *last_present_count = swapchain->present_count; + + return S_OK; } /* IDXGISwapChain1 methods */ diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 75dbf56f995..1e5f9d9cb22 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7476,28 +7476,29 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) present_count = ~0u; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!present_count, "Got unexpected present count %u.\n", present_count); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(!present_count, "Got unexpected present count %u.\n", present_count); hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 10, 0); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_MINIMIZE); @@ -7505,7 +7506,7 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); expected = present_count + !!is_d3d12; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); todo_wine_if(is_d3d12) ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); @@ -7514,8 +7515,9 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); IDXGISwapChain_Release(swapchain); DestroyWindow(window); -- 2.20.1

1 0

[PATCH] winedbg: Accept hex values in command line
by Eric Pouech 01 Jul '21

01 Jul '21

From: Eric Pouech <eric.pouech(a)gmail.com> In Winedbg, when parsing integral values from command line (mainly pid and event), allow hexadecimal values (prefixed by 0x) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/tgt_active.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c9072d5b81c..508e1c58040 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -667,7 +667,7 @@ static BOOL str2int(const char* str, DWORD_PTR* val) { char* ptr; - *val = strtol(str, &ptr, 10); + *val = strtol(str, &ptr, 0); return str < ptr && !*ptr; }

1 0

[PATCH v2] ntoskrnl.exe/tests: Move kernel test utils to wine/test.h.
by Rémi Bernon 01 Jul '21

01 Jul '21

So that we can have full featured wine test with thread local data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 208930 v2: Same thing as before, but don't comment-out the okfile cleanup. dlls/ntoskrnl.exe/tests/Makefile.in | 16 +- dlls/ntoskrnl.exe/tests/driver.c | 36 ++-- dlls/ntoskrnl.exe/tests/driver.h | 8 - dlls/ntoskrnl.exe/tests/driver_hid.c | 2 +- dlls/ntoskrnl.exe/tests/driver_netio.c | 6 +- dlls/ntoskrnl.exe/tests/driver_pnp.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 49 +---- dlls/ntoskrnl.exe/tests/utils.h | 257 ------------------------ include/wine/test.h | 260 +++++++++++++++++++++++-- 9 files changed, 287 insertions(+), 349 deletions(-) delete mode 100644 dlls/ntoskrnl.exe/tests/utils.h diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 863fad30f63..037f0fda637 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,17 +1,23 @@ TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid -driver_IMPORTS = winecrt0 ntoskrnl +driver_IMPORTS = winecrt0 ntoskrnl hal +driver_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver2_IMPORTS = winecrt0 ntoskrnl +driver2_IMPORTS = winecrt0 ntoskrnl hal +driver2_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver3_IMPORTS = winecrt0 ntoskrnl +driver3_IMPORTS = winecrt0 ntoskrnl hal +driver3_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_hid_IMPORTS = winecrt0 ntoskrnl hidclass +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_hid_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio +driver_netio_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal +driver_pnp_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..8c5ac6d89d4 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -33,9 +33,9 @@ #include "ddk/ntifs.h" #include "ddk/wdm.h" -#include "driver.h" +#include "wine/test.h" -#include "utils.h" +#include "driver.h" /* memcmp() isn't exported from ntoskrnl on i386 */ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) @@ -999,41 +999,41 @@ static void test_call_driver(DEVICE_OBJECT *device) irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); - ok(iosb.Information == 123, "got information %#x\n", iosb.Information); + ok(iosb.Information == 123, "got information %#I64x\n", (UINT64)iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &event, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), @@ -1041,8 +1041,8 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); @@ -1118,7 +1118,7 @@ static void test_cancel_irp(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 1, "CurrentLocation = %u\n", irp->CurrentLocation); irpsp = IoGetCurrentIrpStackLocation(irp); - ok(irpsp->DeviceObject == device, "DeviceObject = %u\n", irpsp->DeviceObject); + ok(irpsp->DeviceObject == device, "DeviceObject = %p\n", irpsp->DeviceObject); IoSetCancelRoutine(irp, cancel_irp); cancel_cnt = 0; @@ -1432,16 +1432,16 @@ static void check_resource_(int line, ERESOURCE *resource, ULONG exclusive_waite ULONG count; count = ExGetExclusiveWaiterCount(resource); - ok_(__FILE__, line, count == exclusive_waiters, + ok_(__FILE__, line)(count == exclusive_waiters, "expected %u exclusive waiters, got %u\n", exclusive_waiters, count); count = ExGetSharedWaiterCount(resource); - ok_(__FILE__, line, count == shared_waiters, + ok_(__FILE__, line)(count == shared_waiters, "expected %u shared waiters, got %u\n", shared_waiters, count); ret = ExIsResourceAcquiredExclusiveLite(resource); - ok_(__FILE__, line, ret == exclusive, + ok_(__FILE__, line)(ret == exclusive, "expected exclusive %u, got %u\n", exclusive, ret); count = ExIsResourceAcquiredSharedLite(resource); - ok_(__FILE__, line, count == shared_count, + ok_(__FILE__, line)(count == shared_count, "expected shared %u, got %u\n", shared_count, count); } #define check_resource(a,b,c,d,e) check_resource_(__LINE__,a,b,c,d,e) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 455695ad36b..01d0991a25c 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -49,14 +49,6 @@ static const char teststr[] = "Wine is not an emulator"; -struct test_data -{ - int running_under_wine; - int winetest_report_success; - int winetest_debug; - int successes, failures, skipped, todo_successes, todo_failures; -}; - struct main_test_input { DWORD process_id; diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 793b25f3189..ed3e5c17d6f 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -32,10 +32,10 @@ #include "ddk/hidpi.h" #include "ddk/hidport.h" +#include "wine/test.h" #include "wine/list.h" #include "driver.h" -#include "utils.h" static UNICODE_STRING control_symlink; diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ea9cfd1a4c5..68dbfd1c5e8 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -32,9 +32,9 @@ #include "ddk/wdm.h" #include "ddk/wsk.h" -#include "driver.h" +#include "wine/test.h" -#include "utils.h" +#include "driver.h" static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *device_obj; @@ -141,7 +141,7 @@ static void test_wsk_get_address_info(void) { struct sockaddr_in *addr = (struct sockaddr_in *)addr_info->ai_addr; - ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %u.\n", addr_info->ai_addrlen); + ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %I64u.\n", (UINT64)addr_info->ai_addrlen); ok(addr->sin_family == AF_INET, "Got unexpected sin_family %u.\n", addr->sin_family); ok(ntohs(addr->sin_port) == 12345, "Got unexpected sin_port %u.\n", ntohs(addr->sin_port)); ok(ntohl(addr->sin_addr.s_addr) == 0x7f000001, "Got unexpected sin_addr %#x.\n", diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 98ca2ff7961..cf672f6f397 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -29,10 +29,10 @@ #include "winioctl.h" #include "ddk/wdm.h" +#include "wine/test.h" #include "wine/list.h" #include "driver.h" -#include "utils.h" static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; static const GUID child_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc2}}; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 0ef621011d3..c3456e56274 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -52,8 +52,6 @@ static const GUID GUID_NULL; static HANDLE device; -static struct test_data *test_data; - static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); @@ -367,27 +365,6 @@ static BOOL start_driver(HANDLE service, BOOL vista_plus) return TRUE; } -static HANDLE okfile; - -static void cat_okfile(void) -{ - char buffer[512]; - DWORD size; - - SetFilePointer(okfile, 0, NULL, FILE_BEGIN); - - do - { - ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); - printf("%.*s", size, buffer); - } while (size == sizeof(buffer)); - - SetFilePointer(okfile, 0, NULL, FILE_BEGIN); - SetEndOfFile(okfile); - - winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); -} - static ULONG64 modified_value; static void main_test(void) @@ -931,7 +908,7 @@ static void test_driver_netio(struct testsign_context *ctx) ret = DeleteFileW(filename); ok(ret, "DeleteFile failed: %u\n", GetLastError()); - cat_okfile(); + winetest_kernel_check(); } #ifdef __i386__ @@ -1499,7 +1476,7 @@ static void test_pnp_driver(struct testsign_context *ctx) unload_driver(service); CloseServiceHandle(manager); - cat_okfile(); + winetest_kernel_check(); GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); @@ -2638,7 +2615,7 @@ static void test_hid_driver(struct testsign_context *ctx, DWORD report_id) unload_driver(service); CloseServiceHandle(manager); - cat_okfile(); + winetest_kernel_check(); GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); @@ -2665,7 +2642,6 @@ START_TEST(ntoskrnl) struct testsign_context ctx; SC_HANDLE service, service2; BOOL ret, is_wow64; - HANDLE mapping; DWORD written; pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "RtlDosPathNameToNtPathName_U"); @@ -2685,17 +2661,7 @@ START_TEST(ntoskrnl) if (!testsign_create_cert(&ctx)) return; - mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, - 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); - ok(!!mapping, "got error %u\n", GetLastError()); - test_data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); - test_data->running_under_wine = !strcmp(winetest_platform, "wine"); - test_data->winetest_report_success = winetest_report_success; - test_data->winetest_debug = winetest_debug; - - okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); - ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + winetest_kernel_init(); subtest("driver"); if (!(service = load_driver(&ctx, filename, L"driver.dll", L"WineTestDriver"))) @@ -2737,7 +2703,7 @@ START_TEST(ntoskrnl) ret = DeleteFileW(filename2); ok(ret, "DeleteFile failed: %u\n", GetLastError()); - cat_okfile(); + winetest_kernel_check(); test_driver3(&ctx); subtest("driver_netio"); @@ -2752,8 +2718,5 @@ START_TEST(ntoskrnl) out: testsign_cleanup(&ctx); - UnmapViewOfFile(test_data); - CloseHandle(mapping); - CloseHandle(okfile); - DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); + winetest_kernel_cleanup(); } diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h deleted file mode 100644 index 6a0e00428a5..00000000000 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ /dev/null @@ -1,257 +0,0 @@ -/* - * ntoskrnl.exe testing framework - * - * Copyright 2015 Sebastian Lackner - * Copyright 2015 Michael Müller - * Copyright 2015 Christian Costa - * Copyright 2020 Paul Gofman for CodeWeavers - * Copyright 2020-2021 Zebediah Figura for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -static HANDLE okfile; -static LONG successes; -static LONG failures; -static LONG skipped; -static LONG todo_successes; -static LONG todo_failures; -static int todo_level, todo_do_loop; -static int running_under_wine; -static int winetest_debug; -static int winetest_report_success; - -static inline void kvprintf(const char *format, __ms_va_list ap) -{ - static char buffer[512]; - IO_STATUS_BLOCK io; - int len = vsnprintf(buffer, sizeof(buffer), format, ap); - ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); -} - -static inline void WINAPIV kprintf(const char *format, ...) -{ - __ms_va_list valist; - - __ms_va_start(valist, format); - kvprintf(format, valist); - __ms_va_end(valist); -} - -static inline NTSTATUS winetest_init(void) -{ - const struct test_data *data; - SIZE_T size = sizeof(*data); - OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; - IO_STATUS_BLOCK io; - void *addr = NULL; - HANDLE section; - NTSTATUS ret; - - RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); - /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ - InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); - if ((ret = ZwOpenSection(&section, SECTION_MAP_READ, &attr))) - return ret; - - if ((ret = ZwMapViewOfSection(section, NtCurrentProcess(), &addr, - 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READONLY))) - { - ZwClose(section); - return ret; - } - data = addr; - running_under_wine = data->running_under_wine; - winetest_debug = data->winetest_debug; - winetest_report_success = data->winetest_report_success; - - ZwUnmapViewOfSection(NtCurrentProcess(), addr); - ZwClose(section); - - RtlInitUnicodeString(&string, L"\\??\\C:\\windows\\winetest_ntoskrnl_okfile"); - return ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); -} - -static inline void winetest_cleanup(void) -{ - struct test_data *data; - SIZE_T size = sizeof(*data); - OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; - void *addr = NULL; - HANDLE section; - - if (winetest_debug) - { - kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", skipped ); - } - - RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); - /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ - InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); - - if (!ZwOpenSection(&section, SECTION_MAP_READ | SECTION_MAP_WRITE, &attr)) - { - if (!ZwMapViewOfSection(section, NtCurrentProcess(), &addr, - 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READWRITE)) - { - data = addr; - - InterlockedExchangeAdd(&data->successes, successes); - InterlockedExchangeAdd(&data->failures, failures); - InterlockedExchangeAdd(&data->skipped, skipped); - InterlockedExchangeAdd(&data->todo_successes, todo_successes); - InterlockedExchangeAdd(&data->todo_failures, todo_failures); - - ZwUnmapViewOfSection(NtCurrentProcess(), addr); - } - ZwClose(section); - } - - ZwClose(okfile); -} - -static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) -{ - const char *current_file; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; - - if (todo_level) - { - if (condition) - { - kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); - kvprintf(msg, args); - InterlockedIncrement(&todo_failures); - } - else - { - if (winetest_debug > 0) - { - kprintf("%s:%d: Test marked todo: ", current_file, line); - kvprintf(msg, args); - } - InterlockedIncrement(&todo_successes); - } - } - else - { - if (!condition) - { - kprintf("%s:%d: Test failed: ", current_file, line); - kvprintf(msg, args); - InterlockedIncrement(&failures); - } - else - { - if (winetest_report_success) - kprintf("%s:%d: Test succeeded\n", current_file, line); - InterlockedIncrement(&successes); - } - } -} - -static inline void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) -{ - __ms_va_list args; - __ms_va_start(args, msg); - vok_(file, line, condition, msg, args); - __ms_va_end(args); -} - -static inline void vskip_(const char *file, int line, const char *msg, __ms_va_list args) -{ - const char *current_file; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; - - kprintf("%s:%d: Tests skipped: ", current_file, line); - kvprintf(msg, args); - skipped++; -} - -static inline void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) -{ - __ms_va_list args; - __ms_va_start(args, msg); - if (running_under_wine) - vok_(file, line, 0, msg, args); - else - vskip_(file, line, msg, args); - __ms_va_end(args); -} - -static inline void WINAPIV trace_(const char *file, int line, const char *msg, ...) -{ - const char *current_file; - __ms_va_list args; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; - - __ms_va_start(args, msg); - kprintf("%s:%d: ", current_file, line); - kvprintf(msg, args); - __ms_va_end(args); -} - -static inline void winetest_start_todo( int is_todo ) -{ - todo_level = (todo_level << 1) | (is_todo != 0); - todo_do_loop=1; -} - -static inline int winetest_loop_todo(void) -{ - int do_loop=todo_do_loop; - todo_do_loop=0; - return do_loop; -} - -static inline void winetest_end_todo(void) -{ - todo_level >>= 1; -} - -static inline int broken(int condition) -{ - return !running_under_wine && condition; -} - -#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ - winetest_loop_todo(); \ - winetest_end_todo()) -#define todo_wine todo_if(running_under_wine) -#define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) -#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_(__FILE__, __LINE__, __VA_ARGS__) diff --git a/include/wine/test.h b/include/wine/test.h index 8073071d262..ede648fb717 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -25,6 +25,9 @@ #include <stdlib.h> #include <windef.h> #include <winbase.h> +#ifdef WINETEST_KERNEL +#include <ddk/wdm.h> +#endif /* WINETEST_KERNEL */ #include <wine/debug.h> #ifdef __WINE_CONFIG_H @@ -59,6 +62,9 @@ extern int winetest_mute_threshold; /* current platform */ extern const char *winetest_platform; +/* output file for kernel tests */ +extern HANDLE okfile; + extern void winetest_set_location( const char* file, int line ); extern void winetest_subtest( const char* name ); extern void winetest_ignore_exceptions( BOOL ignore ); @@ -68,6 +74,9 @@ extern void winetest_end_todo(void); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); extern void winetest_add_failures( LONG new_failures ); +extern void winetest_kernel_init( void ); +extern void winetest_kernel_check( void ); +extern void winetest_kernel_cleanup( void ); extern void winetest_wait_child_process( HANDLE process ); #ifdef STANDALONE @@ -214,7 +223,8 @@ DWORD winetest_start_time, winetest_last_time; int winetest_interactive = 0; /* current platform */ -const char *winetest_platform = "windows"; +static char winetest_platform_buf[256] = "windows"; +const char *winetest_platform = winetest_platform_buf; /* report successful tests (BOOL) */ int winetest_report_success = 0; @@ -226,7 +236,9 @@ int winetest_mute_threshold = 42; static int winetest_argc; static char** winetest_argv; +#ifndef WINETEST_KERNEL static const struct test *current_test; /* test currently being run */ +#endif /* WINETEST_KERNEL */ static LONG successes; /* number of successful tests */ static LONG failures; /* number of failures */ @@ -240,9 +252,15 @@ static LONG muted_todo_successes; /* same as todo_successes but silent */ /* counts how many times a given line printed a message */ static LONG line_counters[16384]; +/* output file for driver tests */ +HANDLE okfile; + /* The following data must be kept track of on a per-thread basis */ struct tls_data { +#ifdef WINETEST_KERNEL + HANDLE thread; +#endif /* WINETEST_KERNEL */ const char* current_file; /* file of current check */ int current_line; /* line of current check */ unsigned int todo_level; /* current todo nesting level */ @@ -252,6 +270,38 @@ struct tls_data char context[8][128]; /* data to print before messages */ unsigned int context_count; /* number of context prefixes */ }; + +#ifdef WINETEST_KERNEL + +static KSPIN_LOCK tls_data_lock; +static struct tls_data tls_data_pool[128]; +static DWORD tls_data_count; + +static struct tls_data *get_tls_data(void) +{ + static struct tls_data tls_overflow; + struct tls_data *data; + HANDLE thread = PsGetCurrentThreadId(); + KIRQL irql; + + KeAcquireSpinLock(&tls_data_lock, &irql); + for (data = tls_data_pool; data != tls_data_pool + tls_data_count; ++data) + if (data->thread == thread) break; + if (data == tls_data_pool + ARRAY_SIZE(tls_data_pool)) + data = &tls_overflow; + else if (data == tls_data_pool + tls_data_count) + { + data->thread = thread; + data->str_pos = data->strings; + tls_data_count++; + } + KeReleaseSpinLock(&tls_data_lock, irql); + + return data; +} + +#else /* WINETEST_KERNEL */ + static DWORD tls_index; static struct tls_data *get_tls_data(void) @@ -277,6 +327,7 @@ static void exit_process( int code ) ExitProcess( code ); } +#endif /* WINETEST_KERNEL */ void winetest_set_location( const char* file, int line ) { @@ -291,6 +342,36 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +#ifdef WINETEST_KERNEL + +static inline void __winetest_vprintf(const char *format, __ms_va_list ap) +{ + static char buffer[512]; + IO_STATUS_BLOCK io; + int len = vsnprintf(buffer, sizeof(buffer), format, ap); + ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); +} + +static inline void WINAPIV __winetest_printf(const char *format, ...) +{ + __ms_va_list valist; + + __ms_va_start(valist, format); + __winetest_vprintf(format, valist); + __ms_va_end(valist); +} + +const char *winetest_elapsed(void) +{ + if (!winetest_time) return ""; + return "0.000"; +} + +#else /* WINETEST_KERNEL */ + +#define __winetest_printf printf +#define __winetest_vprintf vprintf + const char *winetest_elapsed(void) { DWORD now; @@ -300,15 +381,17 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } +#endif /* WINETEST_KERNEL */ + static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void __winetest_cdecl winetest_printf( const char *msg, ... ) { struct tls_data *data = get_tls_data(); __winetest_va_list valist; - printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); + __winetest_printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start( valist, msg ); - vprintf( msg, valist ); + __winetest_vprintf( msg, valist ); __winetest_va_end( valist ); } static void __winetest_cdecl winetest_print_context( const char *msgtype ) @@ -318,7 +401,7 @@ static void __winetest_cdecl winetest_print_context( const char *msgtype ) winetest_printf( "%s", msgtype ); for (i = 0; i < data->context_count; ++i) - printf( "%s: ", data->context[i] ); + __winetest_printf( "%s: ", data->context[i] ); } void winetest_subtest( const char* name ) @@ -372,7 +455,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (condition) { winetest_print_context( "Test succeeded inside todo block: " ); - vprintf(msg, args); + __winetest_vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; } @@ -384,7 +467,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (winetest_debug > 0) { winetest_print_context( "Test marked todo: " ); - vprintf(msg, args); + __winetest_vprintf(msg, args); } InterlockedIncrement(&todo_successes); } @@ -398,17 +481,18 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (!condition) { winetest_print_context( "Test failed: " ); - vprintf(msg, args); + __winetest_vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { - if (winetest_report_success || - (winetest_time && GetTickCount() >= winetest_last_time + 1000)) - { + if (winetest_report_success) winetest_printf("Test succeeded\n"); - } +#ifndef WINETEST_KERNEL + else if (winetest_time && GetTickCount() >= winetest_last_time + 1000) + winetest_printf("Test succeeded\n"); +#endif /* WINETEST_KERNEL */ InterlockedIncrement(&successes); return 1; } @@ -434,7 +518,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) { winetest_print_context( "" ); __winetest_va_start(valist, msg); - vprintf( msg, valist ); + __winetest_vprintf( msg, valist ); __winetest_va_end(valist); } else @@ -446,7 +530,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) if (winetest_add_line() < winetest_mute_threshold) { winetest_print_context( "Tests skipped: " ); - vprintf(msg, args); + __winetest_vprintf(msg, args); InterlockedIncrement(&skipped); } else @@ -533,6 +617,155 @@ void winetest_add_failures( LONG new_failures ) InterlockedIncrement( &failures ); } +struct winetest_kernel_data +{ + char winetest_platform[256]; + int running_under_wine; + int winetest_report_success; + int winetest_debug; + int failures; + int todo_failures; +}; + +#ifdef WINETEST_KERNEL + +static int running_under_wine; + +static inline NTSTATUS winetest_init(void) +{ + const struct winetest_kernel_data *data; + SIZE_T size = sizeof(*data); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + void *addr = NULL; + HANDLE section; + NTSTATUS ret; + + KeInitializeSpinLock(&tls_data_lock); + + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_kernel_section"); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); + if ((ret = ZwOpenSection(&section, SECTION_MAP_READ, &attr))) + return ret; + + if ((ret = ZwMapViewOfSection(section, NtCurrentProcess(), &addr, + 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READONLY))) + { + ZwClose(okfile); + ZwClose(section); + return ret; + } + data = addr; + running_under_wine = data->running_under_wine; + winetest_debug = data->winetest_debug; + winetest_report_success = data->winetest_report_success; + strcpy(winetest_platform_buf, data->winetest_platform); + + ZwUnmapViewOfSection(NtCurrentProcess(), addr); + ZwClose(section); + + RtlInitUnicodeString(&string, L"\\??\\C:\\windows\\winetest_kernel_okfile"); + return ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); +} + +static inline void winetest_cleanup(void) +{ + struct winetest_kernel_data *data; + SIZE_T size = sizeof(*data); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + void *addr = NULL; + HANDLE section; + + if (winetest_debug) + { + if (muted_todo_successes || muted_skipped || muted_traces) + __winetest_printf( "%04x:ntoskrnl:%s Silenced %d todos, %d skips and %d traces.\n", + (DWORD)(ULONG_PTR)PsGetCurrentProcessId(), winetest_elapsed(), + muted_todo_successes, muted_skipped, muted_traces); + __winetest_printf( "%04x:ntoskrnl:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + (DWORD)(ULONG_PTR)PsGetCurrentProcessId(), winetest_elapsed(), + successes + failures + todo_successes + todo_failures, + todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", + skipped ); + } + + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_kernel_section"); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); + + if (!ZwOpenSection(&section, SECTION_MAP_READ | SECTION_MAP_WRITE, &attr)) + { + if (!ZwMapViewOfSection(section, NtCurrentProcess(), &addr, + 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READWRITE)) + { + data = addr; + + InterlockedExchangeAdd(&data->failures, failures); + InterlockedExchangeAdd(&data->todo_failures, todo_failures); + + ZwUnmapViewOfSection(NtCurrentProcess(), addr); + } + ZwClose(section); + } + + ZwClose(okfile); +} + +#else /* WINETEST_KERNEL */ + +static HANDLE winetest_mapping; +static struct winetest_kernel_data *kernel_data; + +void winetest_kernel_init(void) +{ + winetest_mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, + sizeof(*kernel_data), "Global\\winetest_kernel_section"); + ok(!!winetest_mapping, "got error %u\n", GetLastError()); + kernel_data = MapViewOfFile(winetest_mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); + ok(strlen(winetest_platform) < 256, "winetest_platform expectedly large!\n"); + strcpy(kernel_data->winetest_platform, winetest_platform); + kernel_data->running_under_wine = !strcmp(winetest_platform, "wine"); + kernel_data->winetest_report_success = winetest_report_success; + kernel_data->winetest_debug = winetest_debug; + + okfile = CreateFileA("C:\\windows\\winetest_kernel_okfile", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); +} + +void winetest_kernel_check(void) +{ + char buffer[512]; + DWORD size; + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + + do + { + ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); + printf("%.*s", size, buffer); + } while (size == sizeof(buffer)); + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + SetEndOfFile(okfile); + + InterlockedExchangeAdd(&failures, InterlockedExchange(&kernel_data->failures, 0)); + InterlockedExchangeAdd(&todo_failures, InterlockedExchange(&kernel_data->todo_failures, 0)); +} + +void winetest_kernel_cleanup(void) +{ + UnmapViewOfFile(kernel_data); + CloseHandle(winetest_mapping); + CloseHandle(okfile); + DeleteFileA("C:\\windows\\winetest_kernel_okfile"); +} + void winetest_wait_child_process( HANDLE process ) { DWORD ret; @@ -702,6 +935,7 @@ int main( int argc, char **argv ) return run_test(argv[1]); } +#endif /* WINETEST_KERNEL */ #endif /* STANDALONE */ #endif /* __WINE_WINE_TEST_H */ -- 2.32.0

1 0

[PATCH] ntoskrnl.exe/tests: Move kernel test utils to wine/test.h.
by Rémi Bernon 01 Jul '21

01 Jul '21

So that we can have full featured wine test with thread local data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I don't know what was going on with [1] and following patches but Marvin reported a succeeded todo_wine on a test that isn't even marked todo. I suspect there's some sort of thread conflict happening and this should fix such issues, see [2] without vs [3] with this patch. We also miss winetest_push_context / winetest_pop_context and all the possible improvements done to winetest, so I think it's good to have this factored together. I've left winetest_elapsed aside, as it requires KeQueryTickCount, which isn't exported on Windows. I don't think it's very important to have it anyway, as we don't even pass winetest_time yet to the driver. Sorry in advance for the amount of time this will take if Marvin decides to run everything... [1] https://testbot.winehq.org/JobDetails.pl?Key=93428 [2] https://testbot.winehq.org/JobDetails.pl?Key=93447 [3] https://testbot.winehq.org/JobDetails.pl?Key=93452 dlls/ntoskrnl.exe/tests/Makefile.in | 16 +- dlls/ntoskrnl.exe/tests/driver.c | 36 ++-- dlls/ntoskrnl.exe/tests/driver.h | 8 - dlls/ntoskrnl.exe/tests/driver_hid.c | 2 +- dlls/ntoskrnl.exe/tests/driver_netio.c | 6 +- dlls/ntoskrnl.exe/tests/driver_pnp.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 49 +---- dlls/ntoskrnl.exe/tests/utils.h | 257 ------------------------ include/wine/test.h | 260 +++++++++++++++++++++++-- 9 files changed, 287 insertions(+), 349 deletions(-) delete mode 100644 dlls/ntoskrnl.exe/tests/utils.h diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 863fad30f63..037f0fda637 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,17 +1,23 @@ TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid -driver_IMPORTS = winecrt0 ntoskrnl +driver_IMPORTS = winecrt0 ntoskrnl hal +driver_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver2_IMPORTS = winecrt0 ntoskrnl +driver2_IMPORTS = winecrt0 ntoskrnl hal +driver2_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver3_IMPORTS = winecrt0 ntoskrnl +driver3_IMPORTS = winecrt0 ntoskrnl hal +driver3_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_hid_IMPORTS = winecrt0 ntoskrnl hidclass +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_hid_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio +driver_netio_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal +driver_pnp_EXTRADEFS = -DSTANDALONE -DWINETEST_KERNEL driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..8c5ac6d89d4 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -33,9 +33,9 @@ #include "ddk/ntifs.h" #include "ddk/wdm.h" -#include "driver.h" +#include "wine/test.h" -#include "utils.h" +#include "driver.h" /* memcmp() isn't exported from ntoskrnl on i386 */ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) @@ -999,41 +999,41 @@ static void test_call_driver(DEVICE_OBJECT *device) irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); - ok(iosb.Information == 123, "got information %#x\n", iosb.Information); + ok(iosb.Information == 123, "got information %#I64x\n", (UINT64)iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &event, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), @@ -1041,8 +1041,8 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); @@ -1118,7 +1118,7 @@ static void test_cancel_irp(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 1, "CurrentLocation = %u\n", irp->CurrentLocation); irpsp = IoGetCurrentIrpStackLocation(irp); - ok(irpsp->DeviceObject == device, "DeviceObject = %u\n", irpsp->DeviceObject); + ok(irpsp->DeviceObject == device, "DeviceObject = %p\n", irpsp->DeviceObject); IoSetCancelRoutine(irp, cancel_irp); cancel_cnt = 0; @@ -1432,16 +1432,16 @@ static void check_resource_(int line, ERESOURCE *resource, ULONG exclusive_waite ULONG count; count = ExGetExclusiveWaiterCount(resource); - ok_(__FILE__, line, count == exclusive_waiters, + ok_(__FILE__, line)(count == exclusive_waiters, "expected %u exclusive waiters, got %u\n", exclusive_waiters, count); count = ExGetSharedWaiterCount(resource); - ok_(__FILE__, line, count == shared_waiters, + ok_(__FILE__, line)(count == shared_waiters, "expected %u shared waiters, got %u\n", shared_waiters, count); ret = ExIsResourceAcquiredExclusiveLite(resource); - ok_(__FILE__, line, ret == exclusive, + ok_(__FILE__, line)(ret == exclusive, "expected exclusive %u, got %u\n", exclusive, ret); count = ExIsResourceAcquiredSharedLite(resource); - ok_(__FILE__, line, count == shared_count, + ok_(__FILE__, line)(count == shared_count, "expected shared %u, got %u\n", shared_count, count); } #define check_resource(a,b,c,d,e) check_resource_(__LINE__,a,b,c,d,e) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 455695ad36b..01d0991a25c 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -49,14 +49,6 @@ static const char teststr[] = "Wine is not an emulator"; -struct test_data -{ - int running_under_wine; - int winetest_report_success; - int winetest_debug; - int successes, failures, skipped, todo_successes, todo_failures; -}; - struct main_test_input { DWORD process_id; diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 793b25f3189..ed3e5c17d6f 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -32,10 +32,10 @@ #include "ddk/hidpi.h" #include "ddk/hidport.h" +#include "wine/test.h" #include "wine/list.h" #include "driver.h" -#include "utils.h" static UNICODE_STRING control_symlink; diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ea9cfd1a4c5..68dbfd1c5e8 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -32,9 +32,9 @@ #include "ddk/wdm.h" #include "ddk/wsk.h" -#include "driver.h" +#include "wine/test.h" -#include "utils.h" +#include "driver.h" static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *device_obj; @@ -141,7 +141,7 @@ static void test_wsk_get_address_info(void) { struct sockaddr_in *addr = (struct sockaddr_in *)addr_info->ai_addr; - ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %u.\n", addr_info->ai_addrlen); + ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %I64u.\n", (UINT64)addr_info->ai_addrlen); ok(addr->sin_family == AF_INET, "Got unexpected sin_family %u.\n", addr->sin_family); ok(ntohs(addr->sin_port) == 12345, "Got unexpected sin_port %u.\n", ntohs(addr->sin_port)); ok(ntohl(addr->sin_addr.s_addr) == 0x7f000001, "Got unexpected sin_addr %#x.\n", diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 98ca2ff7961..cf672f6f397 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -29,10 +29,10 @@ #include "winioctl.h" #include "ddk/wdm.h" +#include "wine/test.h" #include "wine/list.h" #include "driver.h" -#include "utils.h" static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; static const GUID child_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc2}}; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 0ef621011d3..c3456e56274 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -52,8 +52,6 @@ static const GUID GUID_NULL; static HANDLE device; -static struct test_data *test_data; - static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); @@ -367,27 +365,6 @@ static BOOL start_driver(HANDLE service, BOOL vista_plus) return TRUE; } -static HANDLE okfile; - -static void cat_okfile(void) -{ - char buffer[512]; - DWORD size; - - SetFilePointer(okfile, 0, NULL, FILE_BEGIN); - - do - { - ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); - printf("%.*s", size, buffer); - } while (size == sizeof(buffer)); - - SetFilePointer(okfile, 0, NULL, FILE_BEGIN); - SetEndOfFile(okfile); - - winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); -} - static ULONG64 modified_value; static void main_test(void) @@ -931,7 +908,7 @@ static void test_driver_netio(struct testsign_context *ctx) ret = DeleteFileW(filename); ok(ret, "DeleteFile failed: %u\n", GetLastError()); - cat_okfile(); + winetest_kernel_check(); } #ifdef __i386__ @@ -1499,7 +1476,7 @@ static void test_pnp_driver(struct testsign_context *ctx) unload_driver(service); CloseServiceHandle(manager); - cat_okfile(); + winetest_kernel_check(); GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); @@ -2638,7 +2615,7 @@ static void test_hid_driver(struct testsign_context *ctx, DWORD report_id) unload_driver(service); CloseServiceHandle(manager); - cat_okfile(); + winetest_kernel_check(); GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); @@ -2665,7 +2642,6 @@ START_TEST(ntoskrnl) struct testsign_context ctx; SC_HANDLE service, service2; BOOL ret, is_wow64; - HANDLE mapping; DWORD written; pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "RtlDosPathNameToNtPathName_U"); @@ -2685,17 +2661,7 @@ START_TEST(ntoskrnl) if (!testsign_create_cert(&ctx)) return; - mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, - 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); - ok(!!mapping, "got error %u\n", GetLastError()); - test_data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); - test_data->running_under_wine = !strcmp(winetest_platform, "wine"); - test_data->winetest_report_success = winetest_report_success; - test_data->winetest_debug = winetest_debug; - - okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); - ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + winetest_kernel_init(); subtest("driver"); if (!(service = load_driver(&ctx, filename, L"driver.dll", L"WineTestDriver"))) @@ -2737,7 +2703,7 @@ START_TEST(ntoskrnl) ret = DeleteFileW(filename2); ok(ret, "DeleteFile failed: %u\n", GetLastError()); - cat_okfile(); + winetest_kernel_check(); test_driver3(&ctx); subtest("driver_netio"); @@ -2752,8 +2718,5 @@ START_TEST(ntoskrnl) out: testsign_cleanup(&ctx); - UnmapViewOfFile(test_data); - CloseHandle(mapping); - CloseHandle(okfile); - DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); + winetest_kernel_cleanup(); } diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h deleted file mode 100644 index 6a0e00428a5..00000000000 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ /dev/null @@ -1,257 +0,0 @@ -/* - * ntoskrnl.exe testing framework - * - * Copyright 2015 Sebastian Lackner - * Copyright 2015 Michael Müller - * Copyright 2015 Christian Costa - * Copyright 2020 Paul Gofman for CodeWeavers - * Copyright 2020-2021 Zebediah Figura for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -static HANDLE okfile; -static LONG successes; -static LONG failures; -static LONG skipped; -static LONG todo_successes; -static LONG todo_failures; -static int todo_level, todo_do_loop; -static int running_under_wine; -static int winetest_debug; -static int winetest_report_success; - -static inline void kvprintf(const char *format, __ms_va_list ap) -{ - static char buffer[512]; - IO_STATUS_BLOCK io; - int len = vsnprintf(buffer, sizeof(buffer), format, ap); - ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); -} - -static inline void WINAPIV kprintf(const char *format, ...) -{ - __ms_va_list valist; - - __ms_va_start(valist, format); - kvprintf(format, valist); - __ms_va_end(valist); -} - -static inline NTSTATUS winetest_init(void) -{ - const struct test_data *data; - SIZE_T size = sizeof(*data); - OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; - IO_STATUS_BLOCK io; - void *addr = NULL; - HANDLE section; - NTSTATUS ret; - - RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); - /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ - InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); - if ((ret = ZwOpenSection(&section, SECTION_MAP_READ, &attr))) - return ret; - - if ((ret = ZwMapViewOfSection(section, NtCurrentProcess(), &addr, - 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READONLY))) - { - ZwClose(section); - return ret; - } - data = addr; - running_under_wine = data->running_under_wine; - winetest_debug = data->winetest_debug; - winetest_report_success = data->winetest_report_success; - - ZwUnmapViewOfSection(NtCurrentProcess(), addr); - ZwClose(section); - - RtlInitUnicodeString(&string, L"\\??\\C:\\windows\\winetest_ntoskrnl_okfile"); - return ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); -} - -static inline void winetest_cleanup(void) -{ - struct test_data *data; - SIZE_T size = sizeof(*data); - OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; - void *addr = NULL; - HANDLE section; - - if (winetest_debug) - { - kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", skipped ); - } - - RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); - /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ - InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); - - if (!ZwOpenSection(&section, SECTION_MAP_READ | SECTION_MAP_WRITE, &attr)) - { - if (!ZwMapViewOfSection(section, NtCurrentProcess(), &addr, - 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READWRITE)) - { - data = addr; - - InterlockedExchangeAdd(&data->successes, successes); - InterlockedExchangeAdd(&data->failures, failures); - InterlockedExchangeAdd(&data->skipped, skipped); - InterlockedExchangeAdd(&data->todo_successes, todo_successes); - InterlockedExchangeAdd(&data->todo_failures, todo_failures); - - ZwUnmapViewOfSection(NtCurrentProcess(), addr); - } - ZwClose(section); - } - - ZwClose(okfile); -} - -static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) -{ - const char *current_file; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; - - if (todo_level) - { - if (condition) - { - kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); - kvprintf(msg, args); - InterlockedIncrement(&todo_failures); - } - else - { - if (winetest_debug > 0) - { - kprintf("%s:%d: Test marked todo: ", current_file, line); - kvprintf(msg, args); - } - InterlockedIncrement(&todo_successes); - } - } - else - { - if (!condition) - { - kprintf("%s:%d: Test failed: ", current_file, line); - kvprintf(msg, args); - InterlockedIncrement(&failures); - } - else - { - if (winetest_report_success) - kprintf("%s:%d: Test succeeded\n", current_file, line); - InterlockedIncrement(&successes); - } - } -} - -static inline void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) -{ - __ms_va_list args; - __ms_va_start(args, msg); - vok_(file, line, condition, msg, args); - __ms_va_end(args); -} - -static inline void vskip_(const char *file, int line, const char *msg, __ms_va_list args) -{ - const char *current_file; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; - - kprintf("%s:%d: Tests skipped: ", current_file, line); - kvprintf(msg, args); - skipped++; -} - -static inline void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) -{ - __ms_va_list args; - __ms_va_start(args, msg); - if (running_under_wine) - vok_(file, line, 0, msg, args); - else - vskip_(file, line, msg, args); - __ms_va_end(args); -} - -static inline void WINAPIV trace_(const char *file, int line, const char *msg, ...) -{ - const char *current_file; - __ms_va_list args; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; - - __ms_va_start(args, msg); - kprintf("%s:%d: ", current_file, line); - kvprintf(msg, args); - __ms_va_end(args); -} - -static inline void winetest_start_todo( int is_todo ) -{ - todo_level = (todo_level << 1) | (is_todo != 0); - todo_do_loop=1; -} - -static inline int winetest_loop_todo(void) -{ - int do_loop=todo_do_loop; - todo_do_loop=0; - return do_loop; -} - -static inline void winetest_end_todo(void) -{ - todo_level >>= 1; -} - -static inline int broken(int condition) -{ - return !running_under_wine && condition; -} - -#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ - winetest_loop_todo(); \ - winetest_end_todo()) -#define todo_wine todo_if(running_under_wine) -#define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) -#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_(__FILE__, __LINE__, __VA_ARGS__) diff --git a/include/wine/test.h b/include/wine/test.h index 8073071d262..5513022b9c2 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -25,6 +25,9 @@ #include <stdlib.h> #include <windef.h> #include <winbase.h> +#ifdef WINETEST_KERNEL +#include <ddk/wdm.h> +#endif /* WINETEST_KERNEL */ #include <wine/debug.h> #ifdef __WINE_CONFIG_H @@ -59,6 +62,9 @@ extern int winetest_mute_threshold; /* current platform */ extern const char *winetest_platform; +/* output file for kernel tests */ +extern HANDLE okfile; + extern void winetest_set_location( const char* file, int line ); extern void winetest_subtest( const char* name ); extern void winetest_ignore_exceptions( BOOL ignore ); @@ -68,6 +74,9 @@ extern void winetest_end_todo(void); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); extern void winetest_add_failures( LONG new_failures ); +extern void winetest_kernel_init( void ); +extern void winetest_kernel_check( void ); +extern void winetest_kernel_cleanup( void ); extern void winetest_wait_child_process( HANDLE process ); #ifdef STANDALONE @@ -214,7 +223,8 @@ DWORD winetest_start_time, winetest_last_time; int winetest_interactive = 0; /* current platform */ -const char *winetest_platform = "windows"; +static char winetest_platform_buf[256] = "windows"; +const char *winetest_platform = winetest_platform_buf; /* report successful tests (BOOL) */ int winetest_report_success = 0; @@ -226,7 +236,9 @@ int winetest_mute_threshold = 42; static int winetest_argc; static char** winetest_argv; +#ifndef WINETEST_KERNEL static const struct test *current_test; /* test currently being run */ +#endif /* WINETEST_KERNEL */ static LONG successes; /* number of successful tests */ static LONG failures; /* number of failures */ @@ -240,9 +252,15 @@ static LONG muted_todo_successes; /* same as todo_successes but silent */ /* counts how many times a given line printed a message */ static LONG line_counters[16384]; +/* output file for driver tests */ +HANDLE okfile; + /* The following data must be kept track of on a per-thread basis */ struct tls_data { +#ifdef WINETEST_KERNEL + HANDLE thread; +#endif /* WINETEST_KERNEL */ const char* current_file; /* file of current check */ int current_line; /* line of current check */ unsigned int todo_level; /* current todo nesting level */ @@ -252,6 +270,38 @@ struct tls_data char context[8][128]; /* data to print before messages */ unsigned int context_count; /* number of context prefixes */ }; + +#ifdef WINETEST_KERNEL + +static KSPIN_LOCK tls_data_lock; +static struct tls_data tls_data_pool[128]; +static DWORD tls_data_count; + +static struct tls_data *get_tls_data(void) +{ + static struct tls_data tls_overflow; + struct tls_data *data; + HANDLE thread = PsGetCurrentThreadId(); + KIRQL irql; + + KeAcquireSpinLock(&tls_data_lock, &irql); + for (data = tls_data_pool; data != tls_data_pool + tls_data_count; ++data) + if (data->thread == thread) break; + if (data == tls_data_pool + ARRAY_SIZE(tls_data_pool)) + data = &tls_overflow; + else if (data == tls_data_pool + tls_data_count) + { + data->thread = thread; + data->str_pos = data->strings; + tls_data_count++; + } + KeReleaseSpinLock(&tls_data_lock, irql); + + return data; +} + +#else /* WINETEST_KERNEL */ + static DWORD tls_index; static struct tls_data *get_tls_data(void) @@ -277,6 +327,7 @@ static void exit_process( int code ) ExitProcess( code ); } +#endif /* WINETEST_KERNEL */ void winetest_set_location( const char* file, int line ) { @@ -291,6 +342,36 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +#ifdef WINETEST_KERNEL + +static inline void __winetest_vprintf(const char *format, __ms_va_list ap) +{ + static char buffer[512]; + IO_STATUS_BLOCK io; + int len = vsnprintf(buffer, sizeof(buffer), format, ap); + ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); +} + +static inline void WINAPIV __winetest_printf(const char *format, ...) +{ + __ms_va_list valist; + + __ms_va_start(valist, format); + __winetest_vprintf(format, valist); + __ms_va_end(valist); +} + +const char *winetest_elapsed(void) +{ + if (!winetest_time) return ""; + return "0.000"; +} + +#else /* WINETEST_KERNEL */ + +#define __winetest_printf printf +#define __winetest_vprintf vprintf + const char *winetest_elapsed(void) { DWORD now; @@ -300,15 +381,17 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } +#endif /* WINETEST_KERNEL */ + static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void __winetest_cdecl winetest_printf( const char *msg, ... ) { struct tls_data *data = get_tls_data(); __winetest_va_list valist; - printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); + __winetest_printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start( valist, msg ); - vprintf( msg, valist ); + __winetest_vprintf( msg, valist ); __winetest_va_end( valist ); } static void __winetest_cdecl winetest_print_context( const char *msgtype ) @@ -318,7 +401,7 @@ static void __winetest_cdecl winetest_print_context( const char *msgtype ) winetest_printf( "%s", msgtype ); for (i = 0; i < data->context_count; ++i) - printf( "%s: ", data->context[i] ); + __winetest_printf( "%s: ", data->context[i] ); } void winetest_subtest( const char* name ) @@ -372,7 +455,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (condition) { winetest_print_context( "Test succeeded inside todo block: " ); - vprintf(msg, args); + __winetest_vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; } @@ -384,7 +467,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (winetest_debug > 0) { winetest_print_context( "Test marked todo: " ); - vprintf(msg, args); + __winetest_vprintf(msg, args); } InterlockedIncrement(&todo_successes); } @@ -398,17 +481,18 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (!condition) { winetest_print_context( "Test failed: " ); - vprintf(msg, args); + __winetest_vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { - if (winetest_report_success || - (winetest_time && GetTickCount() >= winetest_last_time + 1000)) - { + if (winetest_report_success) winetest_printf("Test succeeded\n"); - } +#ifndef WINETEST_KERNEL + else if (winetest_time && GetTickCount() >= winetest_last_time + 1000) + winetest_printf("Test succeeded\n"); +#endif /* WINETEST_KERNEL */ InterlockedIncrement(&successes); return 1; } @@ -434,7 +518,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) { winetest_print_context( "" ); __winetest_va_start(valist, msg); - vprintf( msg, valist ); + __winetest_vprintf( msg, valist ); __winetest_va_end(valist); } else @@ -446,7 +530,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) if (winetest_add_line() < winetest_mute_threshold) { winetest_print_context( "Tests skipped: " ); - vprintf(msg, args); + __winetest_vprintf(msg, args); InterlockedIncrement(&skipped); } else @@ -533,6 +617,155 @@ void winetest_add_failures( LONG new_failures ) InterlockedIncrement( &failures ); } +struct winetest_kernel_data +{ + char winetest_platform[256]; + int running_under_wine; + int winetest_report_success; + int winetest_debug; + int failures; + int todo_failures; +}; + +#ifdef WINETEST_KERNEL + +static int running_under_wine; + +static inline NTSTATUS winetest_init(void) +{ + const struct winetest_kernel_data *data; + SIZE_T size = sizeof(*data); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + void *addr = NULL; + HANDLE section; + NTSTATUS ret; + + KeInitializeSpinLock(&tls_data_lock); + + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_kernel_section"); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); + if ((ret = ZwOpenSection(&section, SECTION_MAP_READ, &attr))) + return ret; + + if ((ret = ZwMapViewOfSection(section, NtCurrentProcess(), &addr, + 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READONLY))) + { + ZwClose(okfile); + ZwClose(section); + return ret; + } + data = addr; + running_under_wine = data->running_under_wine; + winetest_debug = data->winetest_debug; + winetest_report_success = data->winetest_report_success; + strcpy(winetest_platform_buf, data->winetest_platform); + + ZwUnmapViewOfSection(NtCurrentProcess(), addr); + ZwClose(section); + + RtlInitUnicodeString(&string, L"\\??\\C:\\windows\\winetest_kernel_okfile"); + return ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); +} + +static inline void winetest_cleanup(void) +{ + struct winetest_kernel_data *data; + SIZE_T size = sizeof(*data); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + void *addr = NULL; + HANDLE section; + + if (winetest_debug) + { + if (muted_todo_successes || muted_skipped || muted_traces) + __winetest_printf( "%04x:ntoskrnl:%s Silenced %d todos, %d skips and %d traces.\n", + (DWORD)(ULONG_PTR)PsGetCurrentProcessId(), winetest_elapsed(), + muted_todo_successes, muted_skipped, muted_traces); + __winetest_printf( "%04x:ntoskrnl:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + (DWORD)(ULONG_PTR)PsGetCurrentProcessId(), winetest_elapsed(), + successes + failures + todo_successes + todo_failures, + todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", + skipped ); + } + + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_kernel_section"); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); + + if (!ZwOpenSection(&section, SECTION_MAP_READ | SECTION_MAP_WRITE, &attr)) + { + if (!ZwMapViewOfSection(section, NtCurrentProcess(), &addr, + 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READWRITE)) + { + data = addr; + + InterlockedExchangeAdd(&data->failures, failures); + InterlockedExchangeAdd(&data->todo_failures, todo_failures); + + ZwUnmapViewOfSection(NtCurrentProcess(), addr); + } + ZwClose(section); + } + + ZwClose(okfile); +} + +#else /* WINETEST_KERNEL */ + +static HANDLE winetest_mapping; +static struct winetest_kernel_data *kernel_data; + +void winetest_kernel_init(void) +{ + winetest_mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, + sizeof(*kernel_data), "Global\\winetest_kernel_section"); + ok(!!winetest_mapping, "got error %u\n", GetLastError()); + kernel_data = MapViewOfFile(winetest_mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); + ok(strlen(winetest_platform) < 256, "winetest_platform expectedly large!\n"); + strcpy(kernel_data->winetest_platform, winetest_platform); + kernel_data->running_under_wine = !strcmp(winetest_platform, "wine"); + kernel_data->winetest_report_success = winetest_report_success; + kernel_data->winetest_debug = winetest_debug; + + okfile = CreateFileA("C:\\windows\\winetest_kernel_okfile", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); +} + +void winetest_kernel_check(void) +{ + char buffer[512]; + DWORD size; + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + + do + { + ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); + printf("%.*s", size, buffer); + } while (size == sizeof(buffer)); + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + /* SetEndOfFile(okfile); */ + + InterlockedExchangeAdd(&failures, InterlockedExchange(&kernel_data->failures, 0)); + InterlockedExchangeAdd(&todo_failures, InterlockedExchange(&kernel_data->todo_failures, 0)); +} + +void winetest_kernel_cleanup(void) +{ + UnmapViewOfFile(kernel_data); + CloseHandle(winetest_mapping); + CloseHandle(okfile); + /* DeleteFileA("C:\\windows\\winetest_kernel_okfile"); */ +} + void winetest_wait_child_process( HANDLE process ) { DWORD ret; @@ -702,6 +935,7 @@ int main( int argc, char **argv ) return run_test(argv[1]); } +#endif /* WINETEST_KERNEL */ #endif /* STANDALONE */ #endif /* __WINE_WINE_TEST_H */ -- 2.32.0

1 1

[PATCH v3] dinput: Introduce new HID joystick backend.
by Rémi Bernon 01 Jul '21

01 Jul '21

This adds a new joystick backend, implemented on top of HID and without any host dependencies. This will be progressively implementated, and it's not going to be usable until at least a few more patches. Because of that, and because it may also introduce regressions compared to the existing backends, it is disabled by default and is optionally enabled using the following global registry key: [HKCU\\Software\\Wine\\DirectInput\\Joysticks] "HID"="enabled" Or using the corresponding AppDefaults registry key: [HKCU\\Software\\Wine\\AppDefaults\\<app.exe>\\DirectInput\\Joysticks] "HID"="enabled" This setting will be removed later, when it becomes usable enough, to use the individual device disable mechanism available in joy.cpl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Use setupapi directly, as user32 api usage was confusing. This also now matches device on either their index, HID handle or vid_pid, depending on what's been provided. The instance GUID now includes the HID handle, which will be more stable than the device index in setupapi device list. Matching the vid_pid assumes that setupapi device path is upper case, which I think is the case. We could make sure otherwise but I don't think we have to and it's not very convenient without wcsupr. dlls/dinput/Makefile.in | 3 +- dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 17 +- dlls/dinput/joystick_hid.c | 491 ++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_private.h | 2 +- dlls/dinput8/Makefile.in | 3 +- 9 files changed, 513 insertions(+), 11 deletions(-) create mode 100644 dlls/dinput/joystick_hid.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index a22c8a72180..29d3e8ece65 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) @@ -12,6 +12,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c7b932aca44..88ee1855675 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -80,7 +80,8 @@ static const struct dinput_device *dinput_devices[] = &keyboard_device, &joystick_linuxinput_device, &joystick_linux_device, - &joystick_osx_device + &joystick_osx_device, + &joystick_hid_device, }; HINSTANCE DINPUT_instance; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 7e0f56c68df..c11b64585d9 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -67,6 +67,7 @@ struct DevicePlayer { extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8ea7850621c..60153d0d0f3 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -271,13 +271,13 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) } } -BOOL device_disabled_registry(const char* name) +BOOL device_disabled_registry(const char* name, BOOL disable) { static const char disabled_str[] = "disabled"; + static const char enabled_str[] = "enabled"; static const char joystick_key[] = "Joysticks"; char buffer[MAX_PATH]; HKEY hkey, appkey, temp; - BOOL do_disable = FALSE; get_app_key(&hkey, &appkey); @@ -297,16 +297,23 @@ BOOL device_disabled_registry(const char* name) /* Look for the "controllername"="disabled" key */ if (!get_config_key(hkey, appkey, name, buffer, sizeof(buffer))) - if (!strcmp(disabled_str, buffer)) + { + if (!disable && !strcmp(disabled_str, buffer)) { TRACE("Disabling joystick '%s' based on registry key.\n", name); - do_disable = TRUE; + disable = TRUE; + } + else if (disable && !strcmp(enabled_str, buffer)) + { + TRACE("Enabling joystick '%s' based on registry key.\n", name); + disable = FALSE; } + } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - return do_disable; + return disable; } BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c new file mode 100644 index 00000000000..f29c806a51d --- /dev/null +++ b/dlls/dinput/joystick_hid.c @@ -0,0 +1,491 @@ +/* DirectInput HID Joystick device + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" + +#include "ddk/hidsdi.h" +#include "setupapi.h" +#include "devguid.h" +#include "dinput.h" +#include "setupapi.h" + +#include "wine/debug.h" + +#include "dinput_private.h" +#include "device_private.h" +#include "joystick_private.h" + +#include "initguid.h" +#include "devpkey.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); +DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); + +struct hid_joystick +{ + IDirectInputDeviceImpl base; + + HANDLE device; + PHIDP_PREPARSED_DATA preparsed; +}; + +static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) +{ + return CONTAINING_RECORD( CONTAINING_RECORD( iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface ), + struct hid_joystick, base ); +} + +static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct hid_joystick tmp = *impl; + ULONG res; + + if (!(res = IDirectInputDevice2WImpl_Release( iface ))) + { + HidD_FreePreparsedData( tmp.preparsed ); + CloseHandle( tmp.device ); + } + + return res; +} + +static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, DIDEVCAPS *caps ) +{ + FIXME( "iface %p, caps %p stub!\n", iface, caps ); + + if (!caps) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, REFGUID guid, DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, REFGUID guid, const DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Acquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Unacquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) +{ + FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); + + if (!ptr) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, DIDEVICEOBJECTINSTANCEW *instance, + DWORD obj, DWORD how ) +{ + FIXME( "iface %p, instance %p, obj %#x, how %#x stub!\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, REFGUID rguid, + const DIEFFECT *effect, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, rguid %s, effect %p, out %p, outer %p stub!\n", iface, debugstr_guid( rguid ), + effect, out, outer ); + + if (!out) return E_POINTER; + if (!rguid || !effect) return DI_NOEFFECT; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *ref, DWORD type ) +{ + FIXME( "iface %p, callback %p, ref %p, type %#x stub!\n", iface, callback, ref, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, REFGUID guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD flags ) +{ + FIXME( "iface %p, flags %x stub!\n", iface, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + FIXME( "iface %p, format %p, username %s, flags %#x stub!\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SetActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, format %p, username %s, flags %#x.\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return _set_action_map( iface, format, username, flags, impl->base.data_format.wine_df ); +} + +static const IDirectInputDevice8WVtbl hid_joystick_vtbl = +{ + /*** IUnknown methods ***/ + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + hid_joystick_Release, + /*** IDirectInputDevice methods ***/ + hid_joystick_GetCapabilities, + hid_joystick_EnumObjects, + hid_joystick_GetProperty, + hid_joystick_SetProperty, + hid_joystick_Acquire, + hid_joystick_Unacquire, + hid_joystick_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + hid_joystick_GetObjectInfo, + hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + /*** IDirectInputDevice2 methods ***/ + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + IDirectInputDevice2WImpl_Poll, + IDirectInputDevice2WImpl_SendDeviceData, + /*** IDirectInputDevice7 methods ***/ + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + /*** IDirectInputDevice8 methods ***/ + hid_joystick_BuildActionMap, + hid_joystick_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo, +}; + +static BOOL hid_joystick_device_try_open( const WCHAR *path, HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance ) +{ + PHIDP_PREPARSED_DATA preparsed_data = NULL; + HANDLE device_file; + + device_file = CreateFileW( path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0 ); + if (device_file == INVALID_HANDLE_VALUE) return FALSE; + + if (!HidD_GetPreparsedData( device_file, &preparsed_data )) goto failed; + if (!HidD_GetAttributes( device_file, attrs )) goto failed; + if (HidP_GetCaps( preparsed_data, caps ) != HIDP_STATUS_SUCCESS) goto failed; + + if (caps->UsagePage == HID_USAGE_PAGE_GAME) FIXME( "Unimplemented HID game usage page!\n" ); + if (caps->UsagePage == HID_USAGE_PAGE_SIMULATION) FIXME( "Unimplemented HID simulation usage page!\n" ); + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; + if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; + + if (!HidD_GetProductString( device_file, instance->tszInstanceName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( device_file, instance->tszProductName, MAX_PATH )) goto failed; + + *device = device_file; + *preparsed = preparsed_data; + return TRUE; + +failed: + CloseHandle( device_file ); + HidD_FreePreparsedData( preparsed_data ); + return FALSE; +} + +static HRESULT hid_joystick_device_open( DWORD index, UINT32 handle, UINT32 vid_pid, WCHAR *device_path, + HANDLE *device, DWORD version, PHIDP_PREPARSED_DATA *preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance ) +{ + static const WCHAR vid_pid_fmt_w[] = {'V','I','D','_','%','0','4','X','&','P','I','D','_','%','0','4','X',0}; + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA devinfo = {sizeof(devinfo)}; + WCHAR vid_pid_w[18] = {0}; + UINT32 i = 0, hid_handle; + HDEVINFO set; + DWORD type; + GUID hid; + + TRACE( "index %u, handle %u, vid_pid %d\n", index, handle, vid_pid ); + + HidD_GetHidGuid( &hid ); + snprintfW( vid_pid_w, ARRAY_SIZE(vid_pid_w), vid_pid_fmt_w, vid_pid & 0xffff, vid_pid >> 16 ); + + set = SetupDiGetClassDevsW( &hid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + if (set == INVALID_HANDLE_VALUE) return DIERR_DEVICENOTREG; + + *device = NULL; + *preparsed = NULL; + while (SetupDiEnumDeviceInterfaces( set, NULL, &hid, i++, &iface )) + { + detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof(buffer), NULL, &devinfo )) + continue; + if (!SetupDiGetDevicePropertyW( set, &devinfo, &DEVPROPKEY_HID_HANDLE, &type, + (BYTE *)&hid_handle, sizeof(hid_handle), NULL, 0 ) || + type != DEVPROP_TYPE_UINT32) + continue; + if (!hid_joystick_device_try_open( detail->DevicePath, device, preparsed, attrs, caps, instance )) + continue; + + if (!handle && !vid_pid && !index--) break; + if (handle && handle == hid_handle) break; + if (vid_pid && strstrW( detail->DevicePath, vid_pid_w )) break; + + CloseHandle( *device ); + HidD_FreePreparsedData( *preparsed ); + *device = NULL; + *preparsed = NULL; + } + + SetupDiDestroyDeviceInfoList( set ); + if (!*device || !*preparsed) return DIERR_DEVICENOTREG; + + lstrcpynW( device_path, detail->DevicePath, MAX_PATH ); + instance->guidInstance = hid_joystick_guid; + instance->guidInstance.Data3 = hid_handle; + instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); + instance->dwDevType = get_device_type( version, caps->Usage != HID_USAGE_GENERIC_GAMEPAD ) | DIDEVTYPE_HID; + instance->guidFFDriver = GUID_NULL; + instance->wUsagePage = caps->UsagePage; + instance->wUsage = caps->Usage; + return DI_OK; +} + +static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, + DWORD version, int index ) +{ + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + PHIDP_PREPARSED_DATA preparsed; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "type %x, flags %#x, instance %p, version %04x, index %d\n", type, flags, instance, version, index ); + + hr = hid_joystick_device_open( index, 0, 0, device_path, &device, version, + &preparsed, &attrs, &caps, instance ); + if (hr != DI_OK) return hr; + + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return S_FALSE; + if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) + return S_FALSE; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) + return S_FALSE; + + if (device_disabled_registry( "HID", TRUE )) + return DIERR_DEVICENOTREG; + + TRACE( "Found device %s, usage %04x:%04x, product %s, instance %s, name %s\n", debugstr_w(device_path), + instance->wUsagePage, instance->wUsage, debugstr_guid( &instance->guidProduct ), + debugstr_guid( &instance->guidInstance ), debugstr_w(instance->tszInstanceName) ); + + return DI_OK; +} + +static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, REFGUID guid, IDirectInputDevice8W **out ) +{ + DIDEVICEINSTANCEW instance = {sizeof(instance)}; + GUID inst_guid = *guid, prod_guid = *guid; + DWORD size = sizeof(struct hid_joystick); + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + struct hid_joystick *impl = NULL; + PHIDP_PREPARSED_DATA preparsed; + UINT32 handle = 0, vid_pid = 0; + DIDATAFORMAT *format = NULL; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + + inst_guid.Data3 = hid_joystick_guid.Data3; + prod_guid.Data1 = DInput_PIDVID_Product_GUID.Data1; + if (IsEqualGUID( &hid_joystick_guid, &inst_guid )) handle = guid->Data3; + else if (IsEqualGUID( &DInput_PIDVID_Product_GUID, &prod_guid )) vid_pid = guid->Data1; + else return DIERR_DEVICENOTREG; + + hr = hid_joystick_device_open( 0, handle, vid_pid, device_path, &device, dinput->dwVersion, + &preparsed, &attrs, &caps, &instance ); + if (hr != DI_OK) return hr; + + hr = direct_input_device_alloc( size, &hid_joystick_vtbl, guid, dinput, (void **)&impl ); + if (FAILED(hr)) goto failed; + + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + + impl->device = device; + impl->preparsed = preparsed; + + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) goto failed; + impl->base.data_format.wine_df = format; + + TRACE( "Created %p\n", impl ); + + *out = &impl->base.IDirectInputDevice8W_iface; + return DI_OK; + +failed: + HeapFree( GetProcessHeap(), 0, format ); + HeapFree( GetProcessHeap(), 0, impl ); + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + return hr; +} + +const struct dinput_device joystick_hid_device = +{ + "Wine HID joystick driver", + hid_joystick_enum_device, + hid_joystick_create_device, +}; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3215978c995..312ef3d9c42 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -175,7 +175,7 @@ static INT find_joystick_devices(void) /* Append driver name */ strcat(joydev.name, JOYDEVDRIVER); - if (device_disabled_registry(joydev.name)) { + if (device_disabled_registry(joydev.name, FALSE)) { close(fd); continue; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2b970271ec3..558c8cc19e5 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -264,7 +264,7 @@ static void find_joydevs(void) else joydev.name = joydev.device; - if (device_disabled_registry(joydev.name)) { + if (device_disabled_registry(joydev.name, FALSE)) { close(fd); HeapFree(GetProcessHeap(), 0, joydev.name); if (joydev.name != joydev.device) diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 874bf3e69a7..9cc30605234 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -57,7 +57,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; -BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; +BOOL device_disabled_registry(const char* name, BOOL disable) DECLSPEC_HIDDEN; ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface); diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 35b3bfb75f5..5032c7689bc 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput @@ -13,6 +13,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ -- 2.32.0

3 8

[PATCH 1/3] reg/tests: Verify key opening and key deletion in delete_tree()
by Hugh McMaster 01 Jul '21

01 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 7 +++++-- programs/reg/tests/reg_test.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 36fa634796d..469f354de39 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -154,7 +154,7 @@ void delete_key_(const char *file, unsigned line, HKEY root, const char *path, R } } -LONG delete_tree(HKEY root, const char *path, REGSAM sam) +LONG delete_tree_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam) { HKEY hkey; LONG ret; @@ -163,6 +163,7 @@ LONG delete_tree(HKEY root, const char *path, REGSAM sam) static const char empty[1]; ret = RegOpenKeyExA(root, path, 0, KEY_READ|sam, &hkey); + lok(!ret || ret == ERROR_FILE_NOT_FOUND, "RegOpenKeyExA failed, got error %d\n", ret); if (ret) return ret; ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &max_subkey_len, @@ -184,7 +185,7 @@ LONG delete_tree(HKEY root, const char *path, REGSAM sam) ret = RegEnumKeyExA(hkey, 0, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (ret == ERROR_NO_MORE_ITEMS) break; if (ret) goto cleanup; - ret = delete_tree(hkey, subkey_name, sam); + ret = delete_tree_(file, line, hkey, subkey_name, sam); if (ret) goto cleanup; } @@ -193,6 +194,8 @@ LONG delete_tree(HKEY root, const char *path, REGSAM sam) else ret = RegDeleteKeyExA(hkey, empty, sam, 0); + lok(!ret, "Failed to delete registry key, got error %d\n", ret); + cleanup: HeapFree(GetProcessHeap(), 0, subkey_name); RegCloseKey(hkey); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index a5d7169beb4..3f64e552a19 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -64,7 +64,8 @@ void add_key_(const char *file, unsigned line, const HKEY root, const char *path #define delete_key(r,p,s) delete_key_(__FILE__,__LINE__,r,p,s) void delete_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam); -LONG delete_tree(HKEY root, const char *path, REGSAM sam); +#define delete_tree(r,p,s) delete_tree_(__FILE__,__LINE__,r,p,s) +LONG delete_tree_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam); #define add_value(k,n,t,d,s) add_value_(__FILE__,__LINE__,k,n,t,d,s) void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, -- 2.32.0

1 2

[PATCH v2 1/5] ntoskrnl.exe/tests: Add more tests for button array caps.
by Rémi Bernon 01 Jul '21

01 Jul '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix W7 broken error (ERROR_CRC instead of ERROR_INVALID_PARAMETER). dlls/ntoskrnl.exe/tests/ntoskrnl.c | 52 +++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 71dbfe1a5e9..5a7ca2b1f7b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1841,6 +1841,8 @@ static void test_hidp(HANDLE file, int report_id) { .DataIndex = 1, }, { .DataIndex = 5, .RawValue = 1, }, { .DataIndex = 7, .RawValue = 1, }, + { .DataIndex = 19, .RawValue = 1, }, + { .DataIndex = 21, .RawValue = 1, }, { .DataIndex = 30, }, { .DataIndex = 31, }, { .DataIndex = 32, .RawValue = 0xfeedcafe, }, @@ -2199,6 +2201,20 @@ static void test_hidp(HANDLE file, int report_id) report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + usages[0] = 0x9; + usages[1] = 0xb; + usages[2] = 0xa; + value = 3; + ok(report[6] == 0, "got report[6] %x expected 0\n", report[6]); + ok(report[7] == 0, "got report[7] %x expected 0\n", report[7]); + memcpy(buffer, report, caps.InputReportByteLength); + status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status); + buffer[6] = 2; + buffer[7] = 4; + todo_wine ok(!memcmp(buffer, report, caps.InputReportByteLength), "unexpected report data\n"); + status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status); @@ -2237,23 +2253,35 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetUsagesEx(HidP_Input, 0, usage_and_pages, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsagesEx returned %#x\n", status); - ok(value == 4, "got usage count %d, expected %d\n", value, 4); + todo_wine ok(value == 6, "got usage count %d, expected %d\n", value, 4); ok(usage_and_pages[0].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[0] UsagePage %x, expected %x\n", usage_and_pages[0].UsagePage, HID_USAGE_PAGE_BUTTON); ok(usage_and_pages[1].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[1] UsagePage %x, expected %x\n", usage_and_pages[1].UsagePage, HID_USAGE_PAGE_BUTTON); - ok(usage_and_pages[2].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[2] UsagePage %x, expected %x\n", - usage_and_pages[2].UsagePage, HID_USAGE_PAGE_LED); - ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[3] UsagePage %x, expected %x\n", - usage_and_pages[3].UsagePage, HID_USAGE_PAGE_LED); + ok(usage_and_pages[2].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[2] UsagePage %x, expected %x\n", + usage_and_pages[2].UsagePage, HID_USAGE_PAGE_KEYBOARD); + ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[3] UsagePage %x, expected %x\n", + usage_and_pages[3].UsagePage, HID_USAGE_PAGE_KEYBOARD); + todo_wine + ok(usage_and_pages[4].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[4] UsagePage %x, expected %x\n", + usage_and_pages[4].UsagePage, HID_USAGE_PAGE_LED); + ok(usage_and_pages[5].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[5] UsagePage %x, expected %x\n", + usage_and_pages[5].UsagePage, HID_USAGE_PAGE_LED); ok(usage_and_pages[0].Usage == 4, "got usage_and_pages[0] Usage %x, expected %x\n", usage_and_pages[0].Usage, 4); ok(usage_and_pages[1].Usage == 6, "got usage_and_pages[1] Usage %x, expected %x\n", usage_and_pages[1].Usage, 6); - ok(usage_and_pages[2].Usage == 6, "got usage_and_pages[2] Usage %x, expected %x\n", - usage_and_pages[2].Usage, 6); - ok(usage_and_pages[3].Usage == 4, "got usage_and_pages[3] Usage %x, expected %x\n", - usage_and_pages[3].Usage, 4); + ok(usage_and_pages[2].Usage == 9, "got usage_and_pages[2] Usage %x, expected %x\n", + usage_and_pages[2].Usage, 9); + todo_wine + ok(usage_and_pages[3].Usage == 11, "got usage_and_pages[3] Usage %x, expected %x\n", + usage_and_pages[3].Usage, 11); + todo_wine + ok(usage_and_pages[4].Usage == 6, "got usage_and_pages[4] Usage %x, expected %x\n", + usage_and_pages[4].Usage, 6); + todo_wine + ok(usage_and_pages[5].Usage == 4, "got usage_and_pages[5] Usage %x, expected %x\n", + usage_and_pages[5].Usage, 4); value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); @@ -2267,15 +2295,15 @@ static void test_hidp(HANDLE file, int report_id) value = 1; status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status); - ok(value == 9, "got data count %d, expected %d\n", value, 9); + todo_wine ok(value == 11, "got data count %d, expected %d\n", value, 11); memset(data, 0, sizeof(data)); status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetData returned %#x\n", status); for (i = 0; i < ARRAY_SIZE(expect_data); ++i) { winetest_push_context("data[%d]", i); - check_member(data[i], expect_data[i], "%d", DataIndex); - check_member(data[i], expect_data[i], "%d", RawValue); + todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", DataIndex); + todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", RawValue); winetest_pop_context(); } -- 2.32.0

2 8

[PATCH 5/5] gdi32: Initialize GdiSharedHandleTable in PEB.
by Jacek Caban 01 Jul '21

01 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 16 ++++++++++ dlls/gdi32/tests/gdiobj.c | 62 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 1 deletion(-)

2 1

[PATCH 4/5] gdi32: Use handle layout compatible with GdiSharedHandleTable to store handles.
by Jacek Caban 01 Jul '21

01 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 110 ++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 59 deletions(-)

2 1

[PATCH 3/5] include: Add ntgdi.h file.
by Jacek Caban 01 Jul '21

01 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This file is not present in WinSDK, but it's provided by mingw. We could move it to include/wine, if that's preffered. include/ntgdi.h | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 include/ntgdi.h

2 1

[PATCH 2/5] gdi32: Move more fields from gdi_handle_entry to gdi_obj_header.
by Jacek Caban 01 Jul '21

01 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 10 +++++++ dlls/gdi32/gdiobj.c | 61 ++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 34 deletions(-)

2 1

[PATCH 1/5] gdi32: Introduce gdi_obj_header and use it to store gdi_obj_funcs.
by Jacek Caban 01 Jul '21

01 Jul '21

2 1

[PATCH 1/5] ntoskrnl.exe/tests: Add more tests for button array caps.
by Rémi Bernon 01 Jul '21

01 Jul '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 52 +++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 71dbfe1a5e9..5a7ca2b1f7b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1841,6 +1841,8 @@ static void test_hidp(HANDLE file, int report_id) { .DataIndex = 1, }, { .DataIndex = 5, .RawValue = 1, }, { .DataIndex = 7, .RawValue = 1, }, + { .DataIndex = 19, .RawValue = 1, }, + { .DataIndex = 21, .RawValue = 1, }, { .DataIndex = 30, }, { .DataIndex = 31, }, { .DataIndex = 32, .RawValue = 0xfeedcafe, }, @@ -2199,6 +2201,20 @@ static void test_hidp(HANDLE file, int report_id) report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + usages[0] = 0x9; + usages[1] = 0xb; + usages[2] = 0xa; + value = 3; + ok(report[6] == 0, "got report[6] %x expected 0\n", report[6]); + ok(report[7] == 0, "got report[7] %x expected 0\n", report[7]); + memcpy(buffer, report, caps.InputReportByteLength); + status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status); + buffer[6] = 2; + buffer[7] = 4; + todo_wine ok(!memcmp(buffer, report, caps.InputReportByteLength), "unexpected report data\n"); + status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status); @@ -2237,23 +2253,35 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetUsagesEx(HidP_Input, 0, usage_and_pages, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsagesEx returned %#x\n", status); - ok(value == 4, "got usage count %d, expected %d\n", value, 4); + todo_wine ok(value == 6, "got usage count %d, expected %d\n", value, 4); ok(usage_and_pages[0].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[0] UsagePage %x, expected %x\n", usage_and_pages[0].UsagePage, HID_USAGE_PAGE_BUTTON); ok(usage_and_pages[1].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[1] UsagePage %x, expected %x\n", usage_and_pages[1].UsagePage, HID_USAGE_PAGE_BUTTON); - ok(usage_and_pages[2].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[2] UsagePage %x, expected %x\n", - usage_and_pages[2].UsagePage, HID_USAGE_PAGE_LED); - ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[3] UsagePage %x, expected %x\n", - usage_and_pages[3].UsagePage, HID_USAGE_PAGE_LED); + ok(usage_and_pages[2].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[2] UsagePage %x, expected %x\n", + usage_and_pages[2].UsagePage, HID_USAGE_PAGE_KEYBOARD); + ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[3] UsagePage %x, expected %x\n", + usage_and_pages[3].UsagePage, HID_USAGE_PAGE_KEYBOARD); + todo_wine + ok(usage_and_pages[4].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[4] UsagePage %x, expected %x\n", + usage_and_pages[4].UsagePage, HID_USAGE_PAGE_LED); + ok(usage_and_pages[5].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[5] UsagePage %x, expected %x\n", + usage_and_pages[5].UsagePage, HID_USAGE_PAGE_LED); ok(usage_and_pages[0].Usage == 4, "got usage_and_pages[0] Usage %x, expected %x\n", usage_and_pages[0].Usage, 4); ok(usage_and_pages[1].Usage == 6, "got usage_and_pages[1] Usage %x, expected %x\n", usage_and_pages[1].Usage, 6); - ok(usage_and_pages[2].Usage == 6, "got usage_and_pages[2] Usage %x, expected %x\n", - usage_and_pages[2].Usage, 6); - ok(usage_and_pages[3].Usage == 4, "got usage_and_pages[3] Usage %x, expected %x\n", - usage_and_pages[3].Usage, 4); + ok(usage_and_pages[2].Usage == 9, "got usage_and_pages[2] Usage %x, expected %x\n", + usage_and_pages[2].Usage, 9); + todo_wine + ok(usage_and_pages[3].Usage == 11, "got usage_and_pages[3] Usage %x, expected %x\n", + usage_and_pages[3].Usage, 11); + todo_wine + ok(usage_and_pages[4].Usage == 6, "got usage_and_pages[4] Usage %x, expected %x\n", + usage_and_pages[4].Usage, 6); + todo_wine + ok(usage_and_pages[5].Usage == 4, "got usage_and_pages[5] Usage %x, expected %x\n", + usage_and_pages[5].Usage, 4); value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); @@ -2267,15 +2295,15 @@ static void test_hidp(HANDLE file, int report_id) value = 1; status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status); - ok(value == 9, "got data count %d, expected %d\n", value, 9); + todo_wine ok(value == 11, "got data count %d, expected %d\n", value, 11); memset(data, 0, sizeof(data)); status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetData returned %#x\n", status); for (i = 0; i < ARRAY_SIZE(expect_data); ++i) { winetest_push_context("data[%d]", i); - check_member(data[i], expect_data[i], "%d", DataIndex); - check_member(data[i], expect_data[i], "%d", RawValue); + todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", DataIndex); + todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", RawValue); winetest_pop_context(); } -- 2.32.0

2 10

[PATCH 6/6] nsiproxy: Implement NDIS ifinfo get_parameter for a few parameters.
by Huw Davies 01 Jul '21

01 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 13 ++++++-- dlls/nsiproxy.sys/ndis.c | 70 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 207d3941c0d..d7f6ac9c739 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -113,9 +113,7 @@ static void test_nsi_api( void ) err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); -todo_wine ok( !err, "got %d\n", err ); - if (err) continue; ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); @@ -362,12 +360,23 @@ static void test_ndis_ifinfo( void ) ok( !err, "got %d\n", err ); ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &stat_get.if_guid, sizeof(stat_get.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + luid_get.Value = ~0u; err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), &rw_get, rw_size, &dyn_get, sizeof(dyn_get), &stat_get, sizeof(stat_get) ); ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), + NSI_PARAM_TYPE_STATIC, &stat_get.if_guid, sizeof(stat_get.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); + FreeMibTable( table ); NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 8e5eccbbf23..647fd650cd3 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -515,6 +515,75 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void return status; } +static NTSTATUS ifinfo_get_rw_parameter( struct if_entry *entry, void *data, DWORD data_size, DWORD data_offset ) +{ + switch (data_offset) + { + case FIELD_OFFSET( struct nsi_ndis_ifinfo_rw, alias ): + { + IF_COUNTED_STRING *str = (IF_COUNTED_STRING *)data; + if (data_size != sizeof(*str)) return STATUS_INVALID_PARAMETER; + if_counted_string_init( str, entry->if_name ); + return STATUS_SUCCESS; + } + default: + FIXME( "Offset %#x not handled\n", data_offset ); + } + + return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS ifinfo_get_static_parameter( struct if_entry *entry, void *data, DWORD data_size, DWORD data_offset ) +{ + switch (data_offset) + { + case FIELD_OFFSET( struct nsi_ndis_ifinfo_static, if_index ): + if (data_size != sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + *(DWORD *)data = entry->if_index; + return STATUS_SUCCESS; + + case FIELD_OFFSET( struct nsi_ndis_ifinfo_static, if_guid ): + if (data_size != sizeof(GUID)) return STATUS_INVALID_PARAMETER; + *(GUID *)data = entry->if_guid; + return STATUS_SUCCESS; + + default: + FIXME( "Offset %#x not handled\n", data_offset ); + } + return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_luid( (const NET_LUID *)key ); + if (entry) + { + switch (param_type) + { + case NSI_PARAM_TYPE_RW: + status = ifinfo_get_rw_parameter( entry, data, data_size, data_offset ); + break; + case NSI_PARAM_TYPE_STATIC: + status = ifinfo_get_static_parameter( entry, data, data_size, data_offset ); + break; + } + } + + LeaveCriticalSection( &if_list_cs ); + + return status; +} + static const struct module_table tables[] = { { @@ -525,6 +594,7 @@ static const struct module_table tables[] = }, ifinfo_enumerate_all, ifinfo_get_all_parameters, + ifinfo_get_parameter }, { ~0u } }; -- 2.23.0

1 1

[PATCH 5/6] nsi: Implement NsiGetParameterEx().
by Huw Davies 01 Jul '21

01 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d94222aecfc..08aec49257a 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -257,7 +257,7 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table { struct nsi_get_parameter_ex params; - FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, + TRACE( "%d %p %d %p %d %d %p %d %d\n", unk, module, table, key, key_size, param_type, data, data_size, data_offset ); params.unknown[0] = 0; @@ -277,5 +277,32 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + HANDLE device = get_nsi_device(); + struct nsiproxy_get_parameter *in; + ULONG in_size = FIELD_OFFSET( struct nsiproxy_get_parameter, key[params->key_size] ), received; + DWORD err = ERROR_SUCCESS; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + in = heap_alloc( in_size ); + if (!in) + { + err = ERROR_OUTOFMEMORY; + goto err; + } + in->module = *params->module; + in->first_arg = params->first_arg; + in->table = params->table; + in->key_size = params->key_size; + in->param_type = params->param_type; + in->data_offset = params->data_offset; + memcpy( in->key, params->key, params->key_size ); + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_GET_PARAMETER, in, in_size, params->data, params->data_size, &received, NULL )) + err = GetLastError(); + +err: + heap_free( in ); + CloseHandle( device ); + return err; } -- 2.23.0

1 0

[PATCH 4/6] nsiproxy: Introduce IOCTL_NSIPROXY_WINE_GET_PARAMETER.
by Huw Davies 01 Jul '21

01 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 37 ++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 18 ++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 3 +++ include/wine/nsi.h | 13 ++++++++++ 4 files changed, 71 insertions(+) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 88c65ff4602..aa1d7a08bf7 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -123,6 +123,39 @@ static void nsiproxy_get_all_parameters( IRP *irp ) irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; } +static void nsiproxy_get_parameter( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_get_parameter *in = (struct nsiproxy_get_parameter *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + void *out = irp->AssociatedIrp.SystemBuffer; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + struct nsi_get_parameter_ex get_param; + + if (in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[0]) || + in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[in->key_size])) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + get_param.unknown[0] = 0; + get_param.unknown[1] = 0; + get_param.first_arg = in->first_arg; + get_param.unknown2 = 0; + get_param.module = &in->module; + get_param.table = in->table; + get_param.key = in->key; + get_param.key_size = in->key_size; + get_param.param_type = in->param_type; + get_param.data = out; + get_param.data_size = out_len; + get_param.data_offset = in->data_offset; + + irp->IoStatus.u.Status = nsi_get_parameter_ex( &get_param ); + irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -142,6 +175,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) nsiproxy_get_all_parameters( irp ); break; + case IOCTL_NSIPROXY_WINE_GET_PARAMETER: + nsiproxy_get_parameter( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 2bd8f32fdd7..e4286b5fc93 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -99,3 +99,21 @@ NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) return entry->get_all_parameters( params->key, params->key_size, rw, params->rw_size, dyn, params->dynamic_size, stat, params->static_size ); } + +NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) +{ + const struct module_table *entry = get_module_table( params->module, params->table ); + + if (!entry || !entry->get_parameter) + { + WARN( "table not found\n" ); + return STATUS_INVALID_PARAMETER; + } + + if (params->param_type > 2) return STATUS_INVALID_PARAMETER; + if (params->key_size != entry->sizes[0]) return STATUS_INVALID_PARAMETER; + if (params->data_offset + params->data_size > entry->sizes[params->param_type + 1]) + return STATUS_INVALID_PARAMETER; + return entry->get_parameter( params->key, params->key_size, params->param_type, + params->data, params->data_size, params->data_offset ); +} diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 37cbbd118c0..0cd2a79d59f 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -20,6 +20,7 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; +NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; struct module_table { @@ -31,6 +32,8 @@ struct module_table NTSTATUS (*get_all_parameters)( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); + NTSTATUS (*get_parameter)( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ); }; struct module diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 82183d78190..3327b1f7403 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,7 @@ struct nsi_ndis_ifinfo_static #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS CTL_CODE(FILE_DEVICE_NETWORK, 0x401, METHOD_BUFFERED, 0) +#define IOCTL_NSIPROXY_WINE_GET_PARAMETER CTL_CODE(FILE_DEVICE_NETWORK, 0x402, METHOD_BUFFERED, 0) /* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ struct nsiproxy_enumerate_all @@ -126,6 +127,18 @@ struct nsiproxy_get_all_parameters BYTE key[1]; /* key_size */ }; +/* input for IOCTL_NSIPROXY_WINE_GET_PARAMETER */ +struct nsiproxy_get_parameter +{ + NPI_MODULEID module; + DWORD first_arg; + DWORD table; + DWORD key_size; + DWORD param_type; + DWORD data_offset; + BYTE key[1]; /* key_size */ +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.23.0

1 0

[PATCH 3/6] nsiproxy: Implement NDIS ifinfo get_all_parameters.
by Huw Davies 01 Jul '21

01 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 23 +++++++++++++++++------ dlls/nsiproxy.sys/ndis.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 35ca0bb07c9..207d3941c0d 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -66,9 +66,7 @@ static void test_nsi_api( void ) err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); -todo_wine ok( !err, "got %d\n", err ); - if (err) break; /* test a selection of members */ ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); @@ -115,7 +113,9 @@ todo_wine err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); +todo_wine ok( !err, "got %d\n", err ); + if (err) continue; ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); @@ -257,11 +257,11 @@ static void test_ndis_ifinfo( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), sizeof(struct nsi_ndis_ifinfo_rw) }; - struct nsi_ndis_ifinfo_rw *rw_tbl; - struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2; - struct nsi_ndis_ifinfo_static *stat_tbl; + struct nsi_ndis_ifinfo_rw *rw_tbl, rw_get; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2, dyn_get; + struct nsi_ndis_ifinfo_static *stat_tbl, stat_get; DWORD err, count, i, rw_size; - NET_LUID *luid_tbl, *luid_tbl_2; + NET_LUID *luid_tbl, *luid_tbl_2, luid_get; MIB_IF_TABLE2 *table; /* Contents of GetIfTable2() keyed by luids */ @@ -356,6 +356,17 @@ static void test_ndis_ifinfo( void ) /* OutQLen */ winetest_pop_context(); } + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl, sizeof(*luid_tbl), + &rw_get, rw_size, &dyn_get, sizeof(dyn_get), + &stat_get, sizeof(stat_get) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + + luid_get.Value = ~0u; + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), + &rw_get, rw_size, &dyn_get, sizeof(dyn_get), + &stat_get, sizeof(stat_get) ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); FreeMibTable( table ); NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 356a32635a3..8e5eccbbf23 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -118,6 +118,16 @@ static struct if_entry *find_entry_from_index( DWORD index ) return NULL; } +static struct if_entry *find_entry_from_luid( const NET_LUID *luid ) +{ + struct if_entry *entry; + + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) + if (entry->if_luid.Value == luid->Value) return entry; + + return NULL; +} + #if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR) static NTSTATUS if_get_physical( const char *name, DWORD *type, IF_PHYSICAL_ADDRESS *phys_addr ) { @@ -479,6 +489,32 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d return status; } +static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size ); + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_luid( (const NET_LUID *)key ); + if (entry) + { + ifinfo_fill_entry( entry, NULL, rw_data, dynamic_data, static_data ); + status = STATUS_SUCCESS; + } + + LeaveCriticalSection( &if_list_cs ); + + return status; +} + static const struct module_table tables[] = { { @@ -488,6 +524,7 @@ static const struct module_table tables[] = sizeof(struct nsi_ndis_ifinfo_dynamic), sizeof(struct nsi_ndis_ifinfo_static) }, ifinfo_enumerate_all, + ifinfo_get_all_parameters, }, { ~0u } }; -- 2.23.0

1 0

[PATCH 2/6] nsi: Implement NsiGetAllParametersEx().
by Huw Davies 01 Jul '21

01 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 37054dd0de6..d94222aecfc 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -184,7 +184,7 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t { struct nsi_get_all_parameters_ex params; - FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, + TRACE( "%d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); params.unknown[0] = 0; @@ -207,7 +207,49 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + HANDLE device = get_nsi_device(); + struct nsiproxy_get_all_parameters *in; + ULONG in_size = FIELD_OFFSET( struct nsiproxy_get_all_parameters, key[params->key_size] ), received; + ULONG out_size = params->rw_size + params->dynamic_size + params->static_size; + DWORD err = ERROR_SUCCESS; + BYTE *out, *ptr; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + in = heap_alloc( in_size ); + out = heap_alloc( out_size ); + if (!in || !out) + { + err = ERROR_OUTOFMEMORY; + goto err; + } + + in->module = *params->module; + in->first_arg = params->first_arg; + in->table = params->table; + in->key_size = params->key_size; + in->rw_size = params->rw_size; + in->dynamic_size = params->dynamic_size; + in->static_size = params->static_size; + memcpy( in->key, params->key, params->key_size ); + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS, in, in_size, out, out_size, &received, NULL )) + err = GetLastError(); + if (err == ERROR_SUCCESS) + { + ptr = out; + if (params->rw_size) memcpy( params->rw_data, ptr, params->rw_size ); + ptr += params->rw_size; + if (params->dynamic_size) memcpy( params->dynamic_data, ptr, params->dynamic_size ); + ptr += params->dynamic_size; + if (params->static_size) memcpy( params->static_data, ptr, params->static_size ); + } + +err: + heap_free( out ); + heap_free( in ); + CloseHandle( device ); + return err; } DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, -- 2.23.0

1 0

[PATCH 1/6] nsiproxy: Introduce IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS.
by Huw Davies 01 Jul '21

01 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 45 ++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 25 ++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 4 +++ include/wine/nsi.h | 14 +++++++++ 4 files changed, 88 insertions(+) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 4ce5ddd6d83..88c65ff4602 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -82,6 +82,47 @@ static void nsiproxy_enumerate_all( IRP *irp ) else irp->IoStatus.Information = 0; } +static void nsiproxy_get_all_parameters( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_get_all_parameters *in = (struct nsiproxy_get_all_parameters *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + BYTE *out = irp->AssociatedIrp.SystemBuffer; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + struct nsi_get_all_parameters_ex get_all; + + if (in_len < FIELD_OFFSET(struct nsiproxy_get_all_parameters, key[0]) || + in_len < FIELD_OFFSET(struct nsiproxy_get_all_parameters, key[in->key_size])) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + if (out_len < in->rw_size + in->dynamic_size + in->static_size) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + get_all.unknown[0] = 0; + get_all.unknown[1] = 0; + get_all.first_arg = in->first_arg; + get_all.unknown2 = 0; + get_all.module = &in->module; + get_all.table = in->table; + get_all.key = in->key; + get_all.key_size = in->key_size; + get_all.rw_data = out; + get_all.rw_size = in->rw_size; + get_all.dynamic_data = out + in->rw_size; + get_all.dynamic_size = in->dynamic_size; + get_all.static_data = out + in->rw_size + in->dynamic_size; + get_all.static_size = in->static_size; + + irp->IoStatus.u.Status = nsi_get_all_parameters_ex( &get_all ); + irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -97,6 +138,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) nsiproxy_enumerate_all( irp ); break; + case IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS: + nsiproxy_get_all_parameters( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 85b9be1e587..2bd8f32fdd7 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -74,3 +74,28 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) return entry->enumerate_all( data[0], sizes[0], data[1], sizes[1], data[2], sizes[2], data[3], sizes[3], &params->count ); } + +NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) +{ + const struct module_table *entry = get_module_table( params->module, params->table ); + void *rw = params->rw_data; + void *dyn = params->dynamic_data; + void *stat = params->static_data; + + if (!entry || !entry->get_all_parameters) + { + WARN( "table not found\n" ); + return STATUS_INVALID_PARAMETER; + } + + if (params->key_size != entry->sizes[0]) return STATUS_INVALID_PARAMETER; + if (!params->rw_size) rw = NULL; + else if (params->rw_size != entry->sizes[1]) return STATUS_INVALID_PARAMETER; + if (!params->dynamic_size) dyn = NULL; + else if (params->dynamic_size != entry->sizes[2]) return STATUS_INVALID_PARAMETER; + if (!params->static_size) stat = NULL; + else if (params->static_size != entry->sizes[3]) return STATUS_INVALID_PARAMETER; + + return entry->get_all_parameters( params->key, params->key_size, rw, params->rw_size, + dyn, params->dynamic_size, stat, params->static_size ); +} diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 6745dbc6b56..37cbbd118c0 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -19,6 +19,7 @@ */ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; +NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; struct module_table { @@ -27,6 +28,9 @@ struct module_table NTSTATUS (*enumerate_all)( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD_PTR *count ); + NTSTATUS (*get_all_parameters)( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ); }; struct module diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 799485fc284..82183d78190 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,6 +97,7 @@ struct nsi_ndis_ifinfo_static /* Wine specific ioctl interface */ #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) +#define IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS CTL_CODE(FILE_DEVICE_NETWORK, 0x401, METHOD_BUFFERED, 0) /* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ struct nsiproxy_enumerate_all @@ -112,6 +113,19 @@ struct nsiproxy_enumerate_all DWORD count; }; +/* input for IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS */ +struct nsiproxy_get_all_parameters +{ + NPI_MODULEID module; + DWORD first_arg; + DWORD table; + DWORD key_size; + DWORD rw_size; + DWORD dynamic_size; + DWORD static_size; + BYTE key[1]; /* key_size */ +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.23.0

1 0

wine-devel subscription issue
by Eric Pouech 01 Jul '21

01 Jul '21

Hi folks, </ltns> I cannot reactivate back my account (eric.pouech(a)orange.fr) on wine-devel ML. Looks like a mail issue between winehq and orange domains (subcription on other domain works fine ; but subscription on another address in orange domain also fails : no bounce email received) Tried also mailing to wine-devel-owner without reply... so I would appreciate if someone could have a look at it TIA PS : I have a bunch (*) of patches to offload -- Eric Pouech

1 0

[PATCH v3 4/4] d3dx10: Support block compressed format for D3DX10CreateTextureFromMemory.
by Ziqing Hui 01 Jul '21

01 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +- dlls/d3dx10_43/texture.c | 87 ++++++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 22 deletions(-)

1 0

[PATCH v5 1/3] server: Use a separate request to retrieve the object name.
by Zebediah Figura 01 Jul '21

01 Jul '21

A deleted key returns STATUS_KEY_DELETED when ObjectNameInformation is requested, but succeeds when ObjectBasicInformation is requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/file.c | 2 +- server/handle.c | 11 ++++++++++- server/protocol.def | 7 +++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 1a57a112a59..21bcb215385 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6772,7 +6772,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas /* not a file, treat as a generic object */ - SERVER_START_REQ( get_object_info ) + SERVER_START_REQ( get_object_name ) { req->handle = wine_server_obj_handle( handle ); if (len > sizeof(*p)) wine_server_set_reply( req, p + 1, len - sizeof(*p) ); diff --git a/server/handle.c b/server/handle.c index d86f0960ccf..6efd82f2ff9 100644 --- a/server/handle.c +++ b/server/handle.c @@ -686,13 +686,22 @@ DECL_HANDLER(dup_handle) DECL_HANDLER(get_object_info) { struct object *obj; - WCHAR *name; if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; reply->handle_count = obj->handle_count; + release_object( obj ); +} + +DECL_HANDLER(get_object_name) +{ + struct object *obj; + WCHAR *name; + + if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; + if ((name = obj->ops->get_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); diff --git a/server/protocol.def b/server/protocol.def index 762be1fa7c0..59ed5632503 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3299,6 +3299,13 @@ struct handle_info unsigned int access; /* granted access mask */ unsigned int ref_count; /* object ref count */ unsigned int handle_count; /* object handle count */ +@END + + +/* Query the full name of an object */ +@REQ(get_object_name) + obj_handle_t handle; /* handle to the object */ +@REPLY data_size_t total; /* total needed size for name */ VARARG(name,unicode_str); /* object name */ @END -- 2.30.2

1 2

[PATCH 1/5] ws2_32: Reimplement getsockopt(SO_TYPE) on top of ws_protocol_info().
by Zebediah Figura 01 Jul '21

01 Jul '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ce71e25d63d..9f32e7eaf96 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2259,27 +2259,22 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_TYPE: { - int sock_type; + WSAPROTOCOL_INFOW info; + int size; + if (!optlen || *optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - sock_type = _get_fd_type(fd); - if (sock_type == -1) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - (*(int *)optval) = convert_socktype_u2w(sock_type); + if (!ws_protocol_info( s, TRUE, &info, &size )) + return -1; - release_sock_fd( s, fd ); - return ret; + *(int *)optval = info.iSocketType; + return 0; } + default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); -- 2.30.2

2 6

[PATCH v2 1/5] wined3d: Introduce a prepare_upload_bo device context operation and use it to upload sub-resource data.
by Zebediah Figura 30 Jun '21

30 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cs.c | 54 ++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 3 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 ++++ 5 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9d22a909fb6..4c5e2054fe0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1063,7 +1063,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, if (buffer->flags & WINED3D_BUFFER_USE_BO) { wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - device->cs->c.ops->update_sub_resource(&device->cs->c, resource, + wined3d_device_context_emit_update_sub_resource(&device->cs->c, resource, 0, &box, data->data, data->row_pitch, data->slice_pitch); } else diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 47bc36d4cc0..a3124a229e1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2649,6 +2649,40 @@ done: wined3d_resource_release(resource); } +void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch) +{ + struct wined3d_const_bo_address src_addr; + void *map_ptr; + + if ((map_ptr = context->ops->prepare_upload_bo(context, resource, sub_resource_idx, box, + row_pitch, slice_pitch, WINED3D_MAP_WRITE, &src_addr))) + { + struct wined3d_cs_update_sub_resource *op; + + wined3d_format_copy_data(resource->format, data, row_pitch, slice_pitch, map_ptr, row_pitch, slice_pitch, + box->right - box->left, box->bottom - box->top, box->back - box->front); + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; + op->resource = resource; + op->sub_resource_idx = sub_resource_idx; + op->box = *box; + op->addr = src_addr; + op->row_pitch = row_pitch; + op->slice_pitch = slice_pitch; + + wined3d_device_context_acquire_resource(context, resource); + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); + } + else + { + context->ops->update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, slice_pitch); + } +} + static void wined3d_cs_update_sub_resource(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int slice_pitch) @@ -2946,12 +2980,21 @@ static void wined3d_cs_st_finish(struct wined3d_device_context *context, enum wi { } +static void *wined3d_cs_prepare_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box, unsigned int row_pitch, + unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address) +{ + /* FIXME: We would like to return mapped or newly allocated memory here. */ + return NULL; +} + static const struct wined3d_device_context_ops wined3d_cs_st_ops = { wined3d_cs_st_require_space, wined3d_cs_st_submit, wined3d_cs_st_finish, wined3d_cs_st_push_constants, + wined3d_cs_prepare_upload_bo, wined3d_cs_map, wined3d_cs_unmap, wined3d_cs_update_sub_resource, @@ -3080,6 +3123,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_submit, wined3d_cs_mt_finish, wined3d_cs_mt_push_constants, + wined3d_cs_prepare_upload_bo, wined3d_cs_map, wined3d_cs_unmap, wined3d_cs_update_sub_resource, @@ -3353,6 +3397,15 @@ static void wined3d_deferred_context_push_constants(struct wined3d_device_contex FIXME("context %p, p %#x, start_idx %u, count %u, constants %p, stub!\n", context, p, start_idx, count, constants); } +static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + unsigned int row_pitch, unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address) +{ + FIXME("context %p, resource %p, sub_resource_idx %u, box %p, flags %#x, address %p, stub!\n", + context, resource, sub_resource_idx, box, flags, address); + return false; +} + static HRESULT wined3d_deferred_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags) { @@ -3430,6 +3483,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_submit, wined3d_deferred_context_finish, wined3d_deferred_context_push_constants, + wined3d_deferred_context_prepare_upload_bo, wined3d_deferred_context_map, wined3d_deferred_context_unmap, wined3d_deferred_context_update_sub_resource, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96657141419..e37bf46594c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4679,7 +4679,8 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont return; } - context->ops->update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); + wined3d_device_context_emit_update_sub_resource(context, resource, + sub_resource_idx, box, data, row_pitch, depth_pitch); } void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 62f38a1d592..c1247fbc56b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4350,7 +4350,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { wined3d_texture_get_level_box(*texture, i % (*texture)->level_count, &box); - device->cs->c.ops->update_sub_resource(&device->cs->c, &(*texture)->resource, + wined3d_device_context_emit_update_sub_resource(&device->cs->c, &(*texture)->resource, i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c70b0f7c338..83a0a48471b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4704,6 +4704,9 @@ struct wined3d_device_context_ops void (*finish)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); void (*push_constants)(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants); + void *(*prepare_upload_bo)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box, unsigned int row_pitch, + unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address); HRESULT (*map)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags); HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, @@ -4855,6 +4858,9 @@ void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_co struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) { -- 2.30.2

4 17

[PATCH v4 1/6] server: Retrieve the object name only when requested to.
by Zebediah Figura 30 Jun '21

30 Jun '21

A deleted key returns STATUS_KEY_DELETED when ObjectNameInformation is requested, but succeeds when ObjectBasicInformation is requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index d86f0960ccf..d1288239903 100644 --- a/server/handle.c +++ b/server/handle.c @@ -693,7 +693,7 @@ DECL_HANDLER(get_object_info) reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; reply->handle_count = obj->handle_count; - if ((name = obj->ops->get_full_name( obj, &reply->total ))) + if (get_reply_max_size() && (name = obj->ops->get_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); } -- 2.30.2

3 8

[PATCH 5/5] wininet: the buffer is returned from InternetGetLastResponseInfo() even when the error is 0
by Damjan Jovanovic 30 Jun '21

30 Jun '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 8 ++------ dlls/wininet/tests/ftp.c | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[PATCH v3 1/6] server: Retrieve the object name only when requested to.
by Zebediah Figura 30 Jun '21

30 Jun '21

A deleted key returns STATUS_KEY_DELETED when ObjectNameInformation is requested, but succeeds when ObjectBasicInformation is requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index d86f0960ccf..d1288239903 100644 --- a/server/handle.c +++ b/server/handle.c @@ -693,7 +693,7 @@ DECL_HANDLER(get_object_info) reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; reply->handle_count = obj->handle_count; - if ((name = obj->ops->get_full_name( obj, &reply->total ))) + if (get_reply_max_size() && (name = obj->ops->get_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); } -- 2.30.2

2 8

[PATCH vkd3d 1/5] vkd3d-shader: Allocate the $Params buffer in hlsl_ctx_init().
by Zebediah Figura 30 Jun '21

30 Jun '21

For clarity. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 3 +++ libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 7 ------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0b8c660c..bc593f82 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1664,6 +1664,9 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * if (!(ctx->globals_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, hlsl_strdup(ctx, "$Globals"), NULL, ctx->location))) return false; + if (!(ctx->params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, + hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) + return false; ctx->cur_buffer = ctx->globals_buffer; return true; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b62e7818..e0045acf 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -456,7 +456,7 @@ struct hlsl_ctx struct list extern_vars; struct list buffers; - struct hlsl_buffer *cur_buffer, *globals_buffer; + struct hlsl_buffer *cur_buffer, *globals_buffer, *params_buffer; struct list types; struct rb_tree functions; const struct hlsl_ir_function_decl *cur_function; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6336ddfc..9afa590a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1150,13 +1150,6 @@ static void allocate_buffers(struct hlsl_ctx *ctx) hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) return; - /* The $Globals and $Params buffers should be allocated first, before all - * explicit buffers. */ - list_remove(&params_buffer->entry); - list_add_head(&ctx->buffers, &params_buffer->entry); - list_remove(&ctx->globals_buffer->entry); - list_add_head(&ctx->buffers, &ctx->globals_buffer->entry); - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform) -- 2.32.0

6 9

[PATCH v2 1/6] server: Retrieve the object name only when requested to.
by Zebediah Figura 30 Jun '21

30 Jun '21

A deleted key returns STATUS_KEY_DELETED when ObjectNameInformation is requested, but succeeds when ObjectBasicInformation is requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index d86f0960ccf..d1288239903 100644 --- a/server/handle.c +++ b/server/handle.c @@ -693,7 +693,7 @@ DECL_HANDLER(get_object_info) reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; reply->handle_count = obj->handle_count; - if ((name = obj->ops->get_full_name( obj, &reply->total ))) + if (get_reply_max_size() && (name = obj->ops->get_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); } -- 2.30.2

2 8

[PATCH v2 1/5] include: Declare KeInitializeSpinLock as static FORCEINLINE.
by Rémi Bernon 30 Jun '21

30 Jun '21

And internally rename the ntoskrnl.exe export. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use a static inline KeInitializeSpinLock, as it's apparently not exported on 64bit W7. Reoder patches, tweak removal CS usage in winebus.sys. dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 2 +- include/ddk/wdm.h | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5fdaa922f45..9bea60817b3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -575,7 +575,7 @@ @ stdcall KeInitializeMutex(ptr long) @ stub KeInitializeQueue @ stdcall KeInitializeSemaphore(ptr long long) -@ stdcall KeInitializeSpinLock(ptr) +@ stdcall KeInitializeSpinLock(ptr) NTOSKRNL_KeInitializeSpinLock @ stdcall KeInitializeTimer(ptr) @ stdcall KeInitializeTimerEx(ptr long) @ stub KeInsertByKeyDeviceQueue diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 445c8d890ab..2751032f13d 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -523,7 +523,7 @@ NTSTATUS WINAPI KeDelayExecutionThread( KPROCESSOR_MODE mode, BOOLEAN alertable, /*********************************************************************** * KeInitializeSpinLock (NTOSKRNL.EXE.@) */ -void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) +void WINAPI NTOSKRNL_KeInitializeSpinLock( KSPIN_LOCK *lock ) { TRACE("lock %p.\n", lock); *lock = 0; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 447833c4bc9..ca369c22d09 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1754,7 +1754,10 @@ void WINAPI KeInitializeDpc(KDPC*,PKDEFERRED_ROUTINE,void*); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG); void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG); -void WINAPI KeInitializeSpinLock(KSPIN_LOCK*); +static FORCEINLINE void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) +{ + *lock = 0; +} void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeInitializeTimer(KTIMER*); void WINAPI KeLeaveCriticalRegion(void); -- 2.32.0

3 8

[PATCH vkd3d 1/2] vkd3d-shader: Introduce shader_read_error() for reporting via vkd3d_shader_verror().
by Conor McCarthy 30 Jun '21

30 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 20 +++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +++++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index ce4cecff..e3a8351e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -489,6 +489,8 @@ struct vkd3d_sm4_data struct list src_free; struct list src; struct vkd3d_shader_immediate_constant_buffer icb; + + struct vkd3d_shader_message_context *message_context; }; struct vkd3d_sm4_opcode_info @@ -561,6 +563,16 @@ static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv) return version->major >= 5 && version->minor >= 1; } +static void VKD3D_PRINTF_FUNC(3, 4) shader_read_error(struct vkd3d_sm4_data *priv, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(priv->message_context, NULL, error, format, args); + va_end(args); +} + static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, @@ -629,7 +641,11 @@ static void shader_sm4_read_descriptor_register_range(struct vkd3d_sm4_data *pri range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; if (range->last < range->first) + { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); + shader_read_error(priv, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_RANGE, + "Last register %u must not be less than first register %u in range.\n", range->last, range->first); + } } static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, @@ -1343,7 +1359,7 @@ static enum vkd3d_data_type map_data_type(char t) } void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature) + const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) { DWORD version_token, token_count; struct vkd3d_sm4_data *priv; @@ -1424,6 +1440,8 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, list_init(&priv->src_free); list_init(&priv->src); + priv->message_context = message_context; + return priv; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 40d55b70..54654f3f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -344,7 +344,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, } if (!(parser->data = shader_sm4_init(shader_desc->byte_code, - shader_desc->byte_code_size, &shader_desc->output_signature))) + shader_desc->byte_code_size, &shader_desc->output_signature, message_context))) { WARN("Failed to initialize shader parser.\n"); free_shader_desc(shader_desc); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c61b3773..5e107a6b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -73,6 +73,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING = 2002, + VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_RANGE = 2003, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, @@ -861,8 +862,11 @@ void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; +struct vkd3d_shader_message_context; + void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature) DECLSPEC_HIDDEN; + const struct vkd3d_shader_signature *output_signature, + struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; void shader_sm4_free(void *data) DECLSPEC_HIDDEN; void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version) DECLSPEC_HIDDEN; -- 2.31.1

2 3

[PATCH vkd3d 1/7] vkd3d-shader: Introduce shader_sm4_read_descriptor_register_range().
by Conor McCarthy 30 Jun '21

30 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 70ab70aa..181f7567 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -630,6 +630,16 @@ static unsigned int shader_sm4_map_resource_idx(struct vkd3d_shader_register *re return reg->idx[0].offset; } +static void shader_sm4_read_descriptor_register_range(struct vkd3d_sm4_data *priv, const DWORD **ptr, + const DWORD *end, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) +{ + shader_sm4_read_register_space(priv, ptr, end, &range->space); + range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; + range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; + if (range->last < range->first) + FIXME("Invalid register range [%u:%u].\n", range->first, range->last); +} + static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) @@ -654,8 +664,6 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &semantic->resource.reg); - semantic->resource.range.first = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); - semantic->resource.range.last = semantic->resource.range.first; components = *tokens++; for (i = 0; i < VKD3D_VEC4_SIZE; i++) @@ -676,7 +684,8 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, if (reg_data_type == VKD3D_DATA_UAV) ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &semantic->resource.range.space); + shader_sm4_read_descriptor_register_range(priv, &tokens, end, &semantic->resource.reg.reg, + &semantic->resource.range); } static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, -- 2.31.1

2 7

[PATCH] ntdll: Don't pretend that the whole address space is reserved on non-i386.
by Roman Pišl 30 Jun '21

30 Jun '21

This is analogous to 61dcca5dbf4d0021f420dc87248b39a1dc1542db. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50735 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/ntdll/unix/virtual.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index ef623c0b17a..2484450055d 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4012,10 +4012,18 @@ static int CDECL get_free_mem_state_callback( void *start, SIZE_T size, void *ar else /* outside of the reserved area, pretend it's allocated */ { info->RegionSize = (char *)start - (char *)info->BaseAddress; +#ifdef __i386__ info->State = MEM_RESERVE; info->Protect = PAGE_NOACCESS; info->AllocationProtect = PAGE_NOACCESS; info->Type = MEM_PRIVATE; +#else + info->State = MEM_FREE; + info->Protect = PAGE_NOACCESS; + info->AllocationBase = 0; + info->AllocationProtect = 0; + info->Type = 0; +#endif } return 1; } -- 2.30.2

1 0

[PATCH 4/4] nsi: Implement NsiAllocateAndGetTable() and NsiFreeTable().
by Huw Davies 30 Jun '21

30 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 53 +++++++++++++++++++++++++++++++++++++++++--- dlls/nsi/tests/nsi.c | 5 ++--- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 981fcdba954..37054dd0de6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -39,9 +39,52 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) { - FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + DWORD err, num = 0; + void *data[4] = { NULL }; + DWORD sizes[4] = { key_size, rw_size, dynamic_size, static_size }; + int i, attempt; + + TRACE( "%d %p %d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); - return ERROR_CALL_NOT_IMPLEMENTED; + + for (attempt = 0; attempt < 5; attempt++) + { + err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, NULL, 0, NULL, 0, NULL, 0, NULL, 0, &num ); + if (err) return err; + + for (i = 0; i < ARRAY_SIZE(data); i++) + { + if (sizes[i]) + { + data[i] = heap_alloc( sizes[i] * num ); + if (!data[i]) + { + err = ERROR_OUTOFMEMORY; + goto err; + } + } + } + + err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, data[0], sizes[0], data[1], sizes[1], + data[2], sizes[2], data[3], sizes[3], &num ); + if (err != ERROR_MORE_DATA) break; + + NsiFreeTable( data[0], data[1], data[2], data[3] ); + memset( data, 0, sizeof(data) ); + } + + if (!err) + { + if (sizes[0]) *key_data = data[0]; + if (sizes[1]) *rw_data = data[1]; + if (sizes[2]) *dynamic_data = data[2]; + if (sizes[3]) *static_data = data[3]; + *count = num; + } + +err: + if (err) NsiFreeTable( data[0], data[1], data[2], data[3] ); + return err; } DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, @@ -128,7 +171,11 @@ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *pa void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) { - FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); + TRACE( "%p %p %p %p\n", key_data, rw_data, dynamic_data, static_data ); + heap_free( key_data ); + heap_free( rw_data ); + heap_free( dynamic_data ); + heap_free( static_data ); } DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 51b149e9f65..35ca0bb07c9 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -54,9 +54,7 @@ static void test_nsi_api( void ) (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); if (!err) break; } -todo_wine ok( !err, "got %d\n", err ); - if (err) return; rw_size = rw_sizes[i]; for (i = 0; i < count; i++) @@ -68,7 +66,9 @@ todo_wine err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); +todo_wine ok( !err, "got %d\n", err ); + if (err) break; /* test a selection of members */ ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); @@ -273,7 +273,6 @@ static void test_ndis_ifinfo( void ) (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); if (!err) break; } -todo_wine ok( !err, "got %d\n", err ); if (err) return; rw_size = rw_sizes[i]; -- 2.23.0

1 0

[PATCH 3/4] nsiproxy: Implement NDIS ifinfo enumerate_all.
by Huw Davies 30 Jun '21

30 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/ndis.c | 499 +++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 40 ++- dlls/nsiproxy.sys/nsiproxy_private.h | 17 + 4 files changed, 557 insertions(+), 2 deletions(-) create mode 100644 dlls/nsiproxy.sys/ndis.c diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index f382689d463..e44aacf5b54 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,7 +1,8 @@ MODULE = nsiproxy.sys -IMPORTS = ntoskrnl +IMPORTS = ntoskrnl uuid EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ device.c \ + ndis.c \ nsi.c diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c new file mode 100644 index 00000000000..356a32635a3 --- /dev/null +++ b/dlls/nsiproxy.sys/ndis.c @@ -0,0 +1,499 @@ +/* + * nsiproxy.sys ndis module + * + * Copyright 2003, 2006, 2011 Juan Lang + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + +#ifdef HAVE_NET_IF_H +#include <net/if.h> +#endif + +#ifdef HAVE_NET_IF_ARP_H +#include <net/if_arp.h> +#endif + +#ifdef HAVE_NETINET_IF_ETHER_H +#include <netinet/if_ether.h> +#endif + +#ifdef HAVE_NET_ROUTE_H +#include <net/route.h> +#endif + +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif + +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif + +#ifdef HAVE_NET_IF_DL_H +#include <net/if_dl.h> +#endif + +#ifdef HAVE_NET_IF_TYPES_H +#include <net/if_types.h> +#endif + +#define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ws2ipdef.h" +#include "nldef.h" +#include "ifdef.h" +#include "netiodef.h" +#include "ddk/wdm.h" +#include "wine/nsi.h" +#include "wine/list.h" +#include "wine/heap.h" +#include "wine/debug.h" + +#include "nsiproxy_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +struct if_entry +{ + struct list entry; + GUID if_guid; + NET_LUID if_luid; + WCHAR *if_name; + char if_unix_name[IFNAMSIZ]; + IF_PHYSICAL_ADDRESS if_phys_addr; + DWORD if_index; + DWORD if_type; +}; + +static struct list if_list = LIST_INIT( if_list ); + +static CRITICAL_SECTION if_list_cs; +static CRITICAL_SECTION_DEBUG if_list_cs_debug = +{ + 0, 0, &if_list_cs, + { &if_list_cs_debug.ProcessLocksList, &if_list_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": if_list_cs") } +}; +static CRITICAL_SECTION if_list_cs = { &if_list_cs_debug, -1, 0, 0, 0, 0 }; + +static struct if_entry *find_entry_from_index( DWORD index ) +{ + struct if_entry *entry; + + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) + if (entry->if_index == index) return entry; + + return NULL; +} + +#if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR) +static NTSTATUS if_get_physical( const char *name, DWORD *type, IF_PHYSICAL_ADDRESS *phys_addr ) +{ + int fd, size, i; + struct ifreq ifr; + NTSTATUS ret = STATUS_SUCCESS; + static const struct type_lookup + { + unsigned short ifi_type; + IFTYPE mib_type; + DWORD addr_len; + } types[] = + { + { ARPHRD_LOOPBACK, MIB_IF_TYPE_LOOPBACK, 0 }, + { ARPHRD_ETHER, MIB_IF_TYPE_ETHERNET, ETH_ALEN }, + { ARPHRD_FDDI, MIB_IF_TYPE_FDDI, ETH_ALEN }, + { ARPHRD_IEEE802, MIB_IF_TYPE_TOKENRING, ETH_ALEN }, + { ARPHRD_IEEE802_TR, MIB_IF_TYPE_TOKENRING, ETH_ALEN }, + { ARPHRD_SLIP, MIB_IF_TYPE_SLIP, 0 }, + { ARPHRD_PPP, MIB_IF_TYPE_PPP, 0 } + }; + + *type = MIB_IF_TYPE_OTHER; + memset( phys_addr, 0, sizeof(*phys_addr) ); + + size = strlen( name ) + 1; + if (size > sizeof(ifr.ifr_name)) return STATUS_NAME_TOO_LONG; + memset( &ifr, 0, sizeof(ifr) ); + memcpy( ifr.ifr_name, name, size ); + + fd = socket( PF_INET, SOCK_DGRAM, 0 ); + if (fd == -1) return STATUS_TOO_MANY_OPENED_FILES; + + if (ioctl( fd, SIOCGIFHWADDR, &ifr )) + { + ret = STATUS_DEVICE_DATA_ERROR; + goto err; + } + + for (i = 0; i < ARRAY_SIZE(types); i++) + if (ifr.ifr_hwaddr.sa_family == types[i].ifi_type) + { + *type = types[i].mib_type; + phys_addr->Length = types[i].addr_len; + memcpy( phys_addr->Address, ifr.ifr_hwaddr.sa_data, phys_addr->Length ); + break; + } + +err: + close( fd ); + return ret; +} + +#elif defined (HAVE_SYS_SYSCTL_H) && defined (HAVE_NET_IF_DL_H) + +static NTSTATUS if_get_physical( const char *name, DWORD *type, IF_PHYSICAL_ADDRESS *phys_addr ) +{ + struct if_msghdr *ifm; + struct sockaddr_dl *sdl; + u_char *p, *buf; + size_t mib_len; + int mib[] = { CTL_NET, AF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }, i; + static const struct type_lookup + { + u_char sdl_type; + IFTYPE mib_type; + } types[] = + { + { IFT_ETHER, MIB_IF_TYPE_ETHERNET }, + { IFT_FDDI, MIB_IF_TYPE_FDDI }, + { IFT_ISO88024, MIB_IF_TYPE_TOKENRING }, + { IFT_ISO88025, MIB_IF_TYPE_TOKENRING }, + { IFT_PPP, MIB_IF_TYPE_PPP }, + { IFT_SLIP, MIB_IF_TYPE_SLIP }, + { IFT_LOOP, MIB_IF_TYPE_LOOPBACK } + }; + + *type = MIB_IF_TYPE_OTHER; + memset( phys_addr, 0, sizeof(*phys_addr) ); + + if (sysctl( mib, 6, NULL, &mib_len, NULL, 0 ) < 0) return STATUS_TOO_MANY_OPENED_FILES; + + buf = malloc( mib_len ); + if (!buf) return STATUS_NO_MEMORY; + + if (sysctl( mib, 6, buf, &mib_len, NULL, 0 ) < 0) + { + free( buf ); + return STATUS_TOO_MANY_OPENED_FILES; + } + + for (p = buf; p < buf + mib_len; p += ifm->ifm_msglen) + { + ifm = (struct if_msghdr *)p; + sdl = (struct sockaddr_dl *)(ifm + 1); + + if (ifm->ifm_type != RTM_IFINFO || (ifm->ifm_addrs & RTA_IFP) == 0) continue; + + if (sdl->sdl_family != AF_LINK || sdl->sdl_nlen == 0 || + memcmp( sdl->sdl_data, name, max( sdl->sdl_nlen, strlen( name ) ) )) + continue; + + for (i = 0; i < ARRAY_SIZE(types); i++) + if (sdl->sdl_type == types[i].sdl_type) + { + *type = types[i].mib_type; + break; + } + + phys_addr->Length = sdl->sdl_alen; + if (phys_addr->Length > sizeof(phys_addr->Address)) phys_addr->Length = 0; + memcpy( phys_addr->Address, LLADDR(sdl), phys_addr->Length ); + break; + } + + free( buf ); + return STATUS_SUCCESS; +} +#endif + +static WCHAR *strdupAtoW( const char *str ) +{ + WCHAR *ret = NULL; + DWORD len; + + if (!str) return ret; + len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); + ret = heap_alloc( len * sizeof(WCHAR) ); + if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); + return ret; +} + +static struct if_entry *add_entry( DWORD index, char *name ) +{ + struct if_entry *entry; + int name_len = strlen( name ); + + if (name_len >= IFNAMSIZ - 1) return NULL; + entry = heap_alloc( sizeof(*entry) ); + if (!entry) return NULL; + + entry->if_index = index; + memcpy( entry->if_unix_name, name, name_len + 1 ); + entry->if_name = strdupAtoW( name ); + if (!entry->if_name) + { + heap_free( entry ); + return NULL; + } + + if_get_physical( name, &entry->if_type, &entry->if_phys_addr ); + + entry->if_luid.Info.Reserved = 0; + entry->if_luid.Info.NetLuidIndex = index; + entry->if_luid.Info.IfType = entry->if_type; + + memset( &entry->if_guid, 0, sizeof(entry->if_guid) ); + entry->if_guid.Data1 = index; + memcpy( entry->if_guid.Data4 + 2, "NetDev", 6 ); + + list_add_tail( &if_list, &entry->entry ); + return entry; +} + +static void update_if_table( void ) +{ + struct if_nameindex *indices = if_nameindex(), *entry; + + for (entry = indices; entry->if_index; entry++) + { + if (!find_entry_from_index( entry->if_index )) + add_entry( entry->if_index, entry->if_name ); + } + + if_freenameindex( indices ); +} + +static void if_counted_string_init( IF_COUNTED_STRING *str, const WCHAR *value ) +{ + str->Length = value ? min( lstrlenW( value ), ARRAY_SIZE(str->String) - 1 ) * sizeof(WCHAR) : 0; + if (str->Length) memcpy( str->String, value, str->Length ); + memset( (char *)str->String + str->Length, 0, sizeof(str->String) - str->Length ); +} + +static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_dynamic *data ) +{ + int fd, name_len = strlen( entry->if_unix_name ); + struct ifreq req; + + memset( data, 0, sizeof(*data) ); + + if (name_len >= sizeof(req.ifr_name)) return; + memcpy( req.ifr_name, entry->if_unix_name, name_len + 1 ); + + fd = socket( PF_INET, SOCK_DGRAM, 0 ); + if (fd == -1) return; + + if (!ioctl( fd, SIOCGIFFLAGS, &req )) + { + if (req.ifr_flags & IFF_UP) data->oper_status = IfOperStatusUp; +#ifdef IFF_DORMANT + else if (req.ifr_flags & IFF_DORMANT) data->oper_status = IfOperStatusDormant; +#endif + else data->oper_status = IfOperStatusDown; + } else data->oper_status = IfOperStatusUnknown; + + data->flags.unk = 0; + data->flags.not_media_conn = 0; + data->flags.unk2 = 0; + data->media_conn_state = MediaConnectStateConnected; + data->unk = 0; + + if (!ioctl( fd, SIOCGIFMTU, &req )) data->mtu = req.ifr_mtu; + else data->mtu = 0; + + close( fd ); + +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen( "/proc/net/dev", "r" ))) + { + char buf[512], *ptr; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + while (*ptr && isspace( *ptr )) ptr++; + if (!_strnicmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') + { + unsigned long long values[9]; + ptr += name_len + 1; + sscanf( ptr, "%llu %llu %llu %llu %*u %*u %*u %llu %llu %llu %llu %llu", + values, values + 1, values + 2, values + 3, values + 4, + values + 5, values + 6, values + 7, values + 8 ); + data->in_octets = values[0]; + data->in_ucast_pkts = values[1]; + data->in_errors = values[2]; + data->in_discards = values[3]; + data->in_mcast_pkts = values[4]; + data->out_octets = values[5]; + data->out_ucast_pkts = values[6]; + data->out_errors = values[7]; + data->out_discards = values[8]; + break; + } + } + fclose( fp ); + } + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_IFLIST) + { + int mib[] = { CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, entry->if_index }; + size_t needed; + char *buf = NULL, *end; + struct if_msghdr *ifm; + struct if_data ifdata; + + if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) goto done; + buf = heap_alloc( needed ); + if (!buf) goto done; + if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) goto done; + for (end = buf + needed; buf < end; buf += ifm->ifm_msglen) + { + ifm = (struct if_msghdr *) buf; + if (ifm->ifm_type == RTM_IFINFO) + { + ifdata = ifm->ifm_data; + data->xmit_speed = data->rcv_speed = ifdata.ifi_baudrate; + data->in_octets = ifdata.ifi_ibytes; + data->in_errors = ifdata.ifi_ierrors; + data->in_discards = ifdata.ifi_iqdrops; + data->in_ucast_pkts = ifdata.ifi_ipackets; + data->in_mcast_pkts = ifdata.ifi_imcasts; + data->out_octets = ifdata.ifi_obytes; + data->out_ucast_pkts = ifdata.ifi_opackets; + data->out_mcast_pkts = ifdata.ifi_omcasts; + data->out_errors = ifdata.ifi_oerrors; + break; + } + } + done: + heap_free( buf ); + } +#endif +} + +static void ifinfo_fill_entry( struct if_entry *entry, NET_LUID *key, struct nsi_ndis_ifinfo_rw *rw, + struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) +{ + if (key) memcpy( key, &entry->if_luid, sizeof(entry->if_luid) ); + + if (rw) + { + memset( &rw->network_guid, 0, sizeof(entry->if_guid) ); + rw->admin_status = MIB_IF_ADMIN_STATUS_UP; + if_counted_string_init( &rw->alias, entry->if_name ); + memcpy( &rw->phys_addr, &entry->if_phys_addr, sizeof(entry->if_phys_addr) ); + rw->pad = 0; + if_counted_string_init( &rw->name2, NULL ); + rw->unk = 0; + } + + if (dyn) ifinfo_fill_dynamic( entry, dyn ); + + if (stat) + { + stat->if_index = entry->if_index; + if_counted_string_init( &stat->descr, entry->if_name ); /* get a more descriptive name */ + stat->type = entry->if_type; + stat->access_type = (entry->if_type == MIB_IF_TYPE_LOOPBACK) ? NET_IF_ACCESS_LOOPBACK : NET_IF_ACCESS_BROADCAST; + stat->unk = 0; + stat->conn_type = NET_IF_CONNECTION_DEDICATED; + memcpy( &stat->if_guid, &entry->if_guid, sizeof(entry->if_guid) ); + stat->conn_present = entry->if_type != MIB_IF_TYPE_LOOPBACK; + memcpy( &stat->perm_phys_addr, &entry->if_phys_addr, sizeof(entry->if_phys_addr) ); + stat->flags.hw = entry->if_type != MIB_IF_TYPE_LOOPBACK; + stat->flags.filter = 0; + stat->flags.unk = 0; + stat->media_type = 0; + stat->phys_medium_type = 0; + } +} + +static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + struct if_entry *entry; + DWORD num = 0; + NTSTATUS status = STATUS_SUCCESS; + BOOL want_data = key_size || rw_size || dynamic_size || static_size; + + TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) + { + if (num < *count) + { + ifinfo_fill_entry( entry, key_data, rw_data, dynamic_data, static_data ); + key_data = (BYTE *)key_data + key_size; + rw_data = (BYTE *)rw_data + rw_size; + dynamic_data = (BYTE *)dynamic_data + dynamic_size; + static_data = (BYTE *)static_data + static_size; + } + num++; + } + + LeaveCriticalSection( &if_list_cs ); + + if (!want_data || num <= *count) *count = num; + else status = STATUS_MORE_ENTRIES; + + return status; +} + +static const struct module_table tables[] = +{ + { + NSI_NDIS_IFINFO_TABLE, + { + sizeof(NET_LUID), sizeof(struct nsi_ndis_ifinfo_rw), + sizeof(struct nsi_ndis_ifinfo_dynamic), sizeof(struct nsi_ndis_ifinfo_static) + }, + ifinfo_enumerate_all, + }, + { ~0u } +}; + +const struct module ndis_module = +{ + &NPI_MS_NDIS_MODULEID, + tables +}; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 7ff36c093ba..85b9be1e587 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -30,9 +30,47 @@ #include "ifdef.h" #include "netiodef.h" #include "wine/nsi.h" +#include "wine/debug.h" #include "nsiproxy_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static const struct module *modules[] = +{ + &ndis_module, +}; + +static const struct module_table *get_module_table( const NPI_MODULEID *id, DWORD table ) +{ + const struct module_table *entry; + int i; + + for (i = 0; i < ARRAY_SIZE(modules); i++) + if (NmrIsEqualNpiModuleId( modules[i]->module, id )) + for (entry = modules[i]->tables; entry->table != ~0u; entry++) + if (entry->table == table) return entry; + + return NULL; +} + NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) { - return STATUS_NOT_IMPLEMENTED; + const struct module_table *entry = get_module_table( params->module, params->table ); + DWORD sizes[4] = { params->key_size, params->rw_size, params->dynamic_size, params->static_size }; + void *data[4] = { params->key_data, params->rw_data, params->dynamic_data, params->static_data }; + int i; + + if (!entry || !entry->enumerate_all) + { + WARN( "table not found\n" ); + return STATUS_INVALID_PARAMETER; + } + + for (i = 0; i < ARRAY_SIZE(sizes); i++) + { + if (!sizes[i]) data[i] = NULL; + else if (sizes[i] != entry->sizes[i]) return STATUS_INVALID_PARAMETER; + } + + return entry->enumerate_all( data[0], sizes[0], data[1], sizes[1], data[2], sizes[2], data[3], sizes[3], &params->count ); } diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 19b520d17cc..6745dbc6b56 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -19,3 +19,20 @@ */ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; + +struct module_table +{ + DWORD table; + DWORD sizes[4]; + NTSTATUS (*enumerate_all)( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ); +}; + +struct module +{ + const NPI_MODULEID *module; + const struct module_table *tables; +}; + +extern const struct module ndis_module DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 2/4] iphlpapi: For unknown interface types set the physical address length to zero.
by Huw Davies 30 Jun '21

30 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ifenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 2e99ebe03fd..3b4ac775db7 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -498,7 +498,7 @@ static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr break; #endif default: - addrLen = min(MAX_INTERFACE_PHYSADDR, sizeof(ifr.ifr_hwaddr.sa_data)); + addrLen = 0; *type = MIB_IF_TYPE_OTHER; } if (addrLen > *len) { -- 2.23.0

1 0

[PATCH 1/4] iphlpapi: Fill out a few more MIB_IF_ROW2 entries.
by Huw Davies 30 Jun '21

30 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 21edd9ee128..7b104330ba7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1781,7 +1781,7 @@ DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) */ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) { - DWORD ret, len = ARRAY_SIZE(row2->Description); + DWORD ret; char buf[MAX_ADAPTER_NAME], *name; MIB_IFROW row; @@ -1803,14 +1803,19 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu; - MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Description, len ); + MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Description, ARRAY_SIZE(row2->Description) ); + MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Alias, ARRAY_SIZE(row2->Alias) ); row2->PhysicalAddressLength = row.dwPhysAddrLen; memcpy( &row2->PhysicalAddress, &row.bPhysAddr, row.dwPhysAddrLen ); memcpy( &row2->PermanentPhysicalAddress, &row.bPhysAddr, row.dwPhysAddrLen ); - row2->OperStatus = IfOperStatusUp; + row2->OperStatus = row.dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL ? IfOperStatusUp : IfOperStatusDown; row2->AdminStatus = NET_IF_ADMIN_STATUS_UP; row2->MediaConnectState = MediaConnectStateConnected; row2->ConnectionType = NET_IF_CONNECTION_DEDICATED; + row2->TransmitLinkSpeed = row2->ReceiveLinkSpeed = row.dwSpeed; + row2->AccessType = (row2->Type == MIB_IF_TYPE_LOOPBACK) ? NET_IF_ACCESS_LOOPBACK : NET_IF_ACCESS_BROADCAST; + row2->InterfaceAndOperStatusFlags.ConnectorPresent = row2->Type != MIB_IF_TYPE_LOOPBACK; + row2->InterfaceAndOperStatusFlags.HardwareInterface = row2->Type != MIB_IF_TYPE_LOOPBACK; /* stats */ row2->InOctets = row.dwInOctets; -- 2.23.0

1 0

[PATCH 1/6] server: Retrieve the object name only when requested to.
by Zebediah Figura 30 Jun '21

30 Jun '21

A deleted key returns STATUS_KEY_DELETED when ObjectNameInformation is requested, but succeeds when ObjectBasicInformation is requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index d86f0960ccf..d1288239903 100644 --- a/server/handle.c +++ b/server/handle.c @@ -693,7 +693,7 @@ DECL_HANDLER(get_object_info) reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; reply->handle_count = obj->handle_count; - if ((name = obj->ops->get_full_name( obj, &reply->total ))) + if (get_reply_max_size() && (name = obj->ops->get_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); } -- 2.30.2

2 8

[PATCH 1/2] advapi32/tests: Test the type and impersonation level of a linked token.
by Zebediah Figura 30 Jun '21

30 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/security.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 77748abe9ec..d39aaba7323 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8139,6 +8139,12 @@ static void test_elevation(void) ret = GetTokenInformation(linked.LinkedToken, TokenElevation, &elevation, sizeof(elevation), &size); ok(ret, "got error %u\n", GetLastError()); ok(elevation.TokenIsElevated == TRUE, "got elevation %#x\n", elevation.TokenIsElevated); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); /* Asking for the linked token again gives us a different token. */ ret = GetTokenInformation(token, TokenLinkedToken, &linked2, sizeof(linked2), &size); @@ -8194,6 +8200,12 @@ static void test_elevation(void) ret = GetTokenInformation(linked.LinkedToken, TokenElevation, &elevation, sizeof(elevation), &size); ok(ret, "got error %u\n", GetLastError()); ok(elevation.TokenIsElevated == FALSE, "got elevation %#x\n", elevation.TokenIsElevated); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); /* Asking for the linked token again gives us a different token. */ ret = GetTokenInformation(token, TokenLinkedToken, &linked2, sizeof(linked2), &size); @@ -8249,10 +8261,18 @@ static void test_elevation(void) ret = GetTokenInformation(token2, TokenLinkedToken, &linked, sizeof(linked), &size); ok(ret, "got error %u\n", GetLastError()); if (type == TokenElevationTypeDefault) + { ok(!linked.LinkedToken, "expected no linked token\n"); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); + CloseHandle(linked.LinkedToken); + } else ok(!!linked.LinkedToken, "expected a linked token\n"); - CloseHandle(linked.LinkedToken); CloseHandle(token2); ret = CreateRestrictedToken(token, 0, 0, NULL, 0, NULL, 0, NULL, &token2); -- 2.30.2

1 1

[PATCH v3 1/5] server: Introduce IOCTL_AFD_WINE_SET_SO_SNDBUF.
by Zebediah Figura 30 Jun '21

30 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 1 + server/sock.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index d522b8a289f..ddf780500b7 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -175,6 +175,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 235, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 94dbafe44ee..bcbf3d245be 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2650,6 +2650,30 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_SET_SO_SNDBUF: + { + DWORD sndbuf; + + if (get_req_data_size() < sizeof(sndbuf)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + sndbuf = *(DWORD *)get_req_data(); + +#ifdef __APPLE__ + if (!sndbuf) + { + /* setsockopt fails if a zero value is passed */ + return 0; + } +#endif + + if (setsockopt( unix_fd, SOL_SOCKET, SO_SNDBUF, (char *)&sndbuf, sizeof(sndbuf) ) < 0) + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; -- 2.30.2

1 4

[PATCH v2 3/4] include: Add TBS_E_* to winerror.h
by Alex Henrie 30 Jun '21

30 Jun '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v2: Omit L suffix from constants --- include/winerror.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 8765e177029..c4b8adddebf 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3639,6 +3639,30 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) #define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) +/* Trusted Platform Module Base System error codes */ +#define TBS_E_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x80284001) +#define TBS_E_BAD_PARAMETER _HRESULT_TYPEDEF_(0x80284002) +#define TBS_E_INVALID_OUTPUT_POINTER _HRESULT_TYPEDEF_(0x80284003) +#define TBS_E_INVALID_CONTEXT _HRESULT_TYPEDEF_(0x80284004) +#define TBS_E_INSUFFICIENT_BUFFER _HRESULT_TYPEDEF_(0x80284005) +#define TBS_E_IOERROR _HRESULT_TYPEDEF_(0x80284006) +#define TBS_E_INVALID_CONTEXT_PARAM _HRESULT_TYPEDEF_(0x80284007) +#define TBS_E_SERVICE_NOT_RUNNING _HRESULT_TYPEDEF_(0x80284008) +#define TBS_E_TOO_MANY_TBS_CONTEXTS _HRESULT_TYPEDEF_(0x80284009) +#define TBS_E_TOO_MANY_RESOURCES _HRESULT_TYPEDEF_(0x8028400a) +#define TBS_E_SERVICE_START_PENDING _HRESULT_TYPEDEF_(0x8028400b) +#define TBS_E_PPI_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8028400c) +#define TBS_E_COMMAND_CANCELED _HRESULT_TYPEDEF_(0x8028400d) +#define TBS_E_BUFFER_TOO_LARGE _HRESULT_TYPEDEF_(0x8028400e) +#define TBS_E_TPM_NOT_FOUND _HRESULT_TYPEDEF_(0x8028400f) +#define TBS_E_SERVICE_DISABLED _HRESULT_TYPEDEF_(0x80284010) +#define TBS_E_NO_EVENT_LOG _HRESULT_TYPEDEF_(0x80284011) +#define TBS_E_ACCESS_DENIED _HRESULT_TYPEDEF_(0x80284012) +#define TBS_E_PROVISIONING_NOT_ALLOWED _HRESULT_TYPEDEF_(0x80284013) +#define TBS_E_PPI_FUNCTION_UNSUPPORTED _HRESULT_TYPEDEF_(0x80284014) +#define TBS_E_OWNERAUTH_NOT_FOUND _HRESULT_TYPEDEF_(0x80284015) +#define TBS_E_PROVISIONING_INCOMPLETE _HRESULT_TYPEDEF_(0x80284016) + #define UI_E_CREATE_FAILED _HRESULT_TYPEDEF_(0x802a0001) #define UI_E_SHUTDOWN_CALLED _HRESULT_TYPEDEF_(0x802a0002) #define UI_E_ILLEGAL_REENTRANCY _HRESULT_TYPEDEF_(0x802a0003) -- 2.32.0.94.ge083fb24f6

1 0

[PATCH 1/4] tbs: Add stub DLL
by Alex Henrie 30 Jun '21

30 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51335 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- configure.ac | 1 + dlls/tbs/Makefile.in | 3 +++ dlls/tbs/tbs.spec | 15 +++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 dlls/tbs/Makefile.in create mode 100644 dlls/tbs/tbs.spec diff --git a/configure.ac b/configure.ac index 5c4f0c8a6cb..b14c3518a57 100644 --- a/configure.ac +++ b/configure.ac @@ -3664,6 +3664,7 @@ WINE_CONFIG_MAKEFILE(dlls/tapi32) WINE_CONFIG_MAKEFILE(dlls/tapi32/tests) WINE_CONFIG_MAKEFILE(dlls/taskschd) WINE_CONFIG_MAKEFILE(dlls/taskschd/tests) +WINE_CONFIG_MAKEFILE(dlls/tbs) WINE_CONFIG_MAKEFILE(dlls/tdh) WINE_CONFIG_MAKEFILE(dlls/tdi.sys) WINE_CONFIG_MAKEFILE(dlls/toolhelp.dll16,enable_win16) diff --git a/dlls/tbs/Makefile.in b/dlls/tbs/Makefile.in new file mode 100644 index 00000000000..8f23c81e4f9 --- /dev/null +++ b/dlls/tbs/Makefile.in @@ -0,0 +1,3 @@ +MODULE = tbs.dll + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec new file mode 100644 index 00000000000..50193d10c70 --- /dev/null +++ b/dlls/tbs/tbs.spec @@ -0,0 +1,15 @@ +@ stub Tbsi_Context_Create +@ stub Tbsi_Create_Attestation_From_Log +@ stub Tbsi_FilterLog +@ stub Tbsi_GetDeviceInfo +@ stub Tbsi_Get_OwnerAuth +@ stub Tbsi_Get_TCG_Log +@ stub Tbsi_Get_TCG_Logs +@ stub Tbsi_Physical_Presence_Command +@ stub Tbsi_Revoke_Attestation +@ stub Tbsi_ShaHash +@ stub Tbsip_Cancel_Commands +@ stub Tbsip_Context_Close +@ stub Tbsip_Submit_Command +@ stub Tbsip_Submit_Command_NonBlocking +@ stub Tbsip_TestMorBit -- 2.32.0.94.ge083fb24f6

1 3

[PATCH 1/5] wined3d: Introduce a prepare_upload_bo device context operation and use it to upload sub-resource data.
by Zebediah Figura 30 Jun '21

30 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cs.c | 54 ++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 3 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 ++++ 5 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9d22a909fb6..4c5e2054fe0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1063,7 +1063,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, if (buffer->flags & WINED3D_BUFFER_USE_BO) { wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - device->cs->c.ops->update_sub_resource(&device->cs->c, resource, + wined3d_device_context_emit_update_sub_resource(&device->cs->c, resource, 0, &box, data->data, data->row_pitch, data->slice_pitch); } else diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 47bc36d4cc0..a3124a229e1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2649,6 +2649,40 @@ done: wined3d_resource_release(resource); } +void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch) +{ + struct wined3d_const_bo_address src_addr; + void *map_ptr; + + if ((map_ptr = context->ops->prepare_upload_bo(context, resource, sub_resource_idx, box, + row_pitch, slice_pitch, WINED3D_MAP_WRITE, &src_addr))) + { + struct wined3d_cs_update_sub_resource *op; + + wined3d_format_copy_data(resource->format, data, row_pitch, slice_pitch, map_ptr, row_pitch, slice_pitch, + box->right - box->left, box->bottom - box->top, box->back - box->front); + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; + op->resource = resource; + op->sub_resource_idx = sub_resource_idx; + op->box = *box; + op->addr = src_addr; + op->row_pitch = row_pitch; + op->slice_pitch = slice_pitch; + + wined3d_device_context_acquire_resource(context, resource); + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); + } + else + { + context->ops->update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, slice_pitch); + } +} + static void wined3d_cs_update_sub_resource(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int slice_pitch) @@ -2946,12 +2980,21 @@ static void wined3d_cs_st_finish(struct wined3d_device_context *context, enum wi { } +static void *wined3d_cs_prepare_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box, unsigned int row_pitch, + unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address) +{ + /* FIXME: We would like to return mapped or newly allocated memory here. */ + return NULL; +} + static const struct wined3d_device_context_ops wined3d_cs_st_ops = { wined3d_cs_st_require_space, wined3d_cs_st_submit, wined3d_cs_st_finish, wined3d_cs_st_push_constants, + wined3d_cs_prepare_upload_bo, wined3d_cs_map, wined3d_cs_unmap, wined3d_cs_update_sub_resource, @@ -3080,6 +3123,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_submit, wined3d_cs_mt_finish, wined3d_cs_mt_push_constants, + wined3d_cs_prepare_upload_bo, wined3d_cs_map, wined3d_cs_unmap, wined3d_cs_update_sub_resource, @@ -3353,6 +3397,15 @@ static void wined3d_deferred_context_push_constants(struct wined3d_device_contex FIXME("context %p, p %#x, start_idx %u, count %u, constants %p, stub!\n", context, p, start_idx, count, constants); } +static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + unsigned int row_pitch, unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address) +{ + FIXME("context %p, resource %p, sub_resource_idx %u, box %p, flags %#x, address %p, stub!\n", + context, resource, sub_resource_idx, box, flags, address); + return false; +} + static HRESULT wined3d_deferred_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags) { @@ -3430,6 +3483,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_submit, wined3d_deferred_context_finish, wined3d_deferred_context_push_constants, + wined3d_deferred_context_prepare_upload_bo, wined3d_deferred_context_map, wined3d_deferred_context_unmap, wined3d_deferred_context_update_sub_resource, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96657141419..e37bf46594c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4679,7 +4679,8 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont return; } - context->ops->update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); + wined3d_device_context_emit_update_sub_resource(context, resource, + sub_resource_idx, box, data, row_pitch, depth_pitch); } void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 62f38a1d592..c1247fbc56b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4350,7 +4350,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { wined3d_texture_get_level_box(*texture, i % (*texture)->level_count, &box); - device->cs->c.ops->update_sub_resource(&device->cs->c, &(*texture)->resource, + wined3d_device_context_emit_update_sub_resource(&device->cs->c, &(*texture)->resource, i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c70b0f7c338..83a0a48471b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4704,6 +4704,9 @@ struct wined3d_device_context_ops void (*finish)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); void (*push_constants)(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants); + void *(*prepare_upload_bo)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box, unsigned int row_pitch, + unsigned int slice_pitch, uint32_t flags, struct wined3d_const_bo_address *address); HRESULT (*map)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags); HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, @@ -4855,6 +4858,9 @@ void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_co struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) { -- 2.30.2

2 7

[PATCH v2 1/5] ntoskrnl.exe/tests: Retry timer wait to address spurious failures.
by Rémi Bernon 29 Jun '21

29 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use a custom queue, remove IRPs with STATUS_DELETE_PENDING status. dlls/ntoskrnl.exe/tests/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f1c72d8fdaf..918b4632c40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -756,6 +756,8 @@ static void test_sync(void) ok(ret == 0, "got %#x\n", ret); ret = wait_single(&timer, 0); + /* aliasing makes it sometimes succeeds, try again in that case */ + if (ret == 0) ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); ret = wait_single(&timer, -40 * 10000); -- 2.32.0

3 18

[PATCH] quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a filter has been run asynchronously.
by Zebediah Figura 29 Jun '21

29 Jun '21

This is a valid case in which the filter state may or may not match the graph state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4861d6cf1b0..a1f3757a202 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5106,7 +5106,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F { struct filter_graph *graph = impl_from_IMediaFilter(iface); DWORD end = GetTickCount() + timeout; - FILTER_STATE expect_state; HRESULT hr; TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state); @@ -5122,7 +5121,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F EnterCriticalSection(&graph->cs); *state = graph->state; - expect_state = graph->needs_async_run ? State_Paused : graph->state; for (;;) { @@ -5154,9 +5152,18 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F else if (filter_state != graph->state && filter_state != State_Paused) hr = E_FAIL; - if (filter_state != expect_state) - ERR("Filter %p reported incorrect state %u (expected %u).\n", - filter->filter, filter_state, expect_state); + if (graph->needs_async_run) + { + if (filter_state != State_Paused && filter_state != State_Running) + ERR("Filter %p reported incorrect state %u (expected %u or %u).\n", + filter->filter, filter_state, State_Paused, State_Running); + } + else + { + if (filter_state != graph->state) + ERR("Filter %p reported incorrect state %u (expected %u).\n", + filter->filter, filter_state, graph->state); + } } LeaveCriticalSection(&graph->cs); -- 2.30.2

1 0

[PATCH 1/3] winegstreamer: Change the formatting of error and warning messages a bit.
by Zebediah Figura 29 Jun '21

29 Jun '21

The TestBot treats anything containing the string ": error: " as a compiler error. It may be possible for the TestBot to be smarter, but it seems easier just to tweak winegstreamer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/wg_parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index ee4c6c95f5b..916c3cbcb76 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1389,8 +1389,8 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use { case GST_MESSAGE_ERROR: gst_message_parse_error(msg, &err, &dbg_info); - fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); + fprintf(stderr, "winegstreamer error: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + fprintf(stderr, "winegstreamer error: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); pthread_mutex_lock(&parser->mutex); @@ -1401,8 +1401,8 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use case GST_MESSAGE_WARNING: gst_message_parse_warning(msg, &err, &dbg_info); - fprintf(stderr, "winegstreamer: warning: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - fprintf(stderr, "winegstreamer: warning: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); + fprintf(stderr, "winegstreamer warning: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + fprintf(stderr, "winegstreamer warning: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); break; -- 2.30.2

1 2

[PATCH v2 1/7] ws2_32: Handle SO_RCVTIMEO in the server.
by Zebediah Figura 29 Jun '21

29 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 10 +++++----- dlls/ws2_32/tests/sock.c | 8 ++++---- include/wine/afd.h | 2 ++ server/sock.c | 40 +++++++++++++++++++++++++++++++++------- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7ed48124a5a..15c9d0cc940 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2289,6 +2289,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVBUF, optval, optlen ); case WS_SO_RCVTIMEO: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVTIMEO, optval, optlen ); + case WS_SO_SNDTIMEO: { INT64 timeout; @@ -3565,6 +3567,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_RCVBUF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVBUF, optval, optlen ); + case WS_SO_RCVTIMEO: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVTIMEO, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3631,13 +3636,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, TRACE("setting global SO_OPENTYPE = 0x%x\n", *((const int*)optval) ); return 0; -#ifdef SO_RCVTIMEO - case WS_SO_RCVTIMEO: -#endif #ifdef SO_SNDTIMEO case WS_SO_SNDTIMEO: -#endif -#if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO) if (optval && optlen == sizeof(UINT32)) { /* WinSock passes milliseconds instead of struct timeval */ tval.tv_usec = (*(const UINT32*)optval % 1000) * 1000; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ccaa04e4ef5..a3f7e002ce7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10919,7 +10919,7 @@ static void test_timeout(void) WSASetLastError(0xdeadbeef); ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(len == sizeof(timeout), "got size %u\n", len); ok(!timeout, "got timeout %u\n", timeout); @@ -10927,15 +10927,15 @@ static void test_timeout(void) WSASetLastError(0xdeadbeef); ret = setsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); timeout = 0xdeadbeef; len = sizeof(timeout); WSASetLastError(0xdeadbeef); ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); - todo_wine ok(timeout == 100, "got timeout %u\n", timeout); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(timeout == 100, "got timeout %u\n", timeout); WSASetLastError(0xdeadbeef); ret = recv(client, &buffer, 1, 0); diff --git a/include/wine/afd.h b/include/wine/afd.h index 0692394459e..c4f7c7a6413 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -171,6 +171,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 8bad31efdd1..94dbafe44ee 100644 --- a/server/sock.c +++ b/server/sock.c @@ -208,6 +208,7 @@ struct sock union win_sockaddr addr; /* socket name */ int addr_len; /* socket name length */ unsigned int rcvbuf; /* advisory recv buffer size */ + unsigned int rcvtimeo; /* receive timeout in ms */ unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ @@ -1388,6 +1389,7 @@ static struct sock *create_socket(void) sock->nonblocking = 0; sock->bound = 0; sock->rcvbuf = 0; + sock->rcvtimeo = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -2619,6 +2621,35 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_RCVTIMEO: + { + DWORD rcvtimeo = sock->rcvtimeo; + + if (get_reply_max_size() < sizeof(rcvtimeo)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &rcvtimeo, sizeof(rcvtimeo) ); + return 1; + } + + case IOCTL_AFD_WINE_SET_SO_RCVTIMEO: + { + DWORD rcvtimeo; + + if (get_req_data_size() < sizeof(rcvtimeo)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + rcvtimeo = *(DWORD *)get_req_data(); + + sock->rcvtimeo = rcvtimeo; + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -3029,19 +3060,14 @@ DECL_HANDLER(recv_socket) /* recv() returned EWOULDBLOCK, i.e. no data available yet */ if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) { -#ifdef SO_RCVTIMEO - struct timeval tv; - socklen_t len = sizeof(tv); - /* Set a timeout on the async if necessary. * * We want to do this *only* if the client gave us STATUS_DEVICE_NOT_READY. * If the client gave us STATUS_PENDING, it expects the async to always * block (it was triggered by WSARecv*() with a valid OVERLAPPED * structure) and for the timeout not to be respected. */ - if (is_fd_overlapped( fd ) && !getsockopt( get_unix_fd( fd ), SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, &len )) - timeout = tv.tv_sec * -10000000 + tv.tv_usec * -10; -#endif + if (is_fd_overlapped( fd )) + timeout = (timeout_t)sock->rcvtimeo * -10000; status = STATUS_PENDING; } -- 2.30.2

3 10

[PATCH] msvcr120/tests: wcstof() depends on the system locale.
by Francois Gouget 29 Jun '21

29 Jun '21

Arabic numerals are only recognized Arabic system locales. Also test a mix of Arabic and Roman numerals. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e8002f6cb55..2a0e638be1b 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -601,6 +601,7 @@ static void test__strtof(void) const char float3[] = "-3.402823466e+38"; const char float4[] = "1.7976931348623158e+308"; /* DBL_MAX */ + BOOL is_arabic; char *end; float f; @@ -638,8 +639,12 @@ static void test__strtof(void) f = p_wcstof(L"12.0", NULL); ok(f == 12.0, "f = %lf\n", f); - f = p_wcstof(L"\x0662\x0663", NULL); - ok(f == 0, "f = %lf\n", f); + f = p_wcstof(L"\x0662\x0663", NULL); /* 23 in Arabic numerals */ + is_arabic = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ARABIC); + todo_wine_if(is_arabic) ok(f == (is_arabic ? 23.0 : 0.0), "f = %lf\n", f); + + f = p_wcstof(L"\x0662\x34\x0663", NULL); /* Arabic + Roman numerals mix */ + todo_wine_if(is_arabic) ok(f == (is_arabic ? 243.0 : 0.0), "f = %lf\n", f); if(!p_setlocale(LC_ALL, "Arabic")) { win_skip("Arabic locale not available\n"); @@ -649,8 +654,8 @@ static void test__strtof(void) f = p_wcstof(L"12.0", NULL); ok(f == 12.0, "f = %lf\n", f); - f = p_wcstof(L"\x0662\x0663", NULL); - ok(f == 0, "f = %lf\n", f); + f = p_wcstof(L"\x0662\x0663", NULL); /* 23 in Arabic numerals */ + todo_wine_if(is_arabic) ok(f == (is_arabic ? 23.0 : 0.0), "f = %lf\n", f); p_setlocale(LC_ALL, "C"); } -- 2.20.1

2 1

[PATCH v2 1/5] dinput: Introduce new HID joystick backend.
by Rémi Bernon 29 Jun '21

29 Jun '21

This adds a new joystick backend, implemented on top of HID and without any host dependencies. This will be progressively implementated, and it's not going to be usable until at least a few more patches. Because of that, and because it may also introduce regressions compared to the existing backends, it is disabled by default and is optionally enabled using the following global registry key: [HKCU\\Software\\Wine\\DirectInput\\Joysticks] "HID"="enabled" Or using the corresponding AppDefaults registry key: [HKCU\\Software\\Wine\\AppDefaults\\<app.exe>\\DirectInput\\Joysticks] "HID"="enabled" This setting will be removed later, when it becomes usable enough, to use the individual device disable mechanism available in joy.cpl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Make the backend disabled by default, optionally enabled in the registry. This is only temporary until we have at least input support. dlls/dinput/Makefile.in | 3 +- dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 17 +- dlls/dinput/joystick_hid.c | 450 ++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_private.h | 2 +- dlls/dinput8/Makefile.in | 3 +- 9 files changed, 472 insertions(+), 11 deletions(-) create mode 100644 dlls/dinput/joystick_hid.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index a22c8a72180..f2347927ed6 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) @@ -12,6 +12,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c7b932aca44..88ee1855675 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -80,7 +80,8 @@ static const struct dinput_device *dinput_devices[] = &keyboard_device, &joystick_linuxinput_device, &joystick_linux_device, - &joystick_osx_device + &joystick_osx_device, + &joystick_hid_device, }; HINSTANCE DINPUT_instance; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 7e0f56c68df..c11b64585d9 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -67,6 +67,7 @@ struct DevicePlayer { extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8ea7850621c..60153d0d0f3 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -271,13 +271,13 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) } } -BOOL device_disabled_registry(const char* name) +BOOL device_disabled_registry(const char* name, BOOL disable) { static const char disabled_str[] = "disabled"; + static const char enabled_str[] = "enabled"; static const char joystick_key[] = "Joysticks"; char buffer[MAX_PATH]; HKEY hkey, appkey, temp; - BOOL do_disable = FALSE; get_app_key(&hkey, &appkey); @@ -297,16 +297,23 @@ BOOL device_disabled_registry(const char* name) /* Look for the "controllername"="disabled" key */ if (!get_config_key(hkey, appkey, name, buffer, sizeof(buffer))) - if (!strcmp(disabled_str, buffer)) + { + if (!disable && !strcmp(disabled_str, buffer)) { TRACE("Disabling joystick '%s' based on registry key.\n", name); - do_disable = TRUE; + disable = TRUE; + } + else if (disable && !strcmp(enabled_str, buffer)) + { + TRACE("Enabling joystick '%s' based on registry key.\n", name); + disable = FALSE; } + } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - return do_disable; + return disable; } BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c new file mode 100644 index 00000000000..fadc7d9efe4 --- /dev/null +++ b/dlls/dinput/joystick_hid.c @@ -0,0 +1,450 @@ +/* DirectInput HID Joystick device + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" + +#include "ddk/hidsdi.h" +#include "devguid.h" +#include "dinput.h" +#include "setupapi.h" + +#include "wine/debug.h" + +#include "dinput_private.h" +#include "device_private.h" +#include "joystick_private.h" + +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); + +struct hid_joystick +{ + IDirectInputDeviceImpl base; + + HANDLE device; + PHIDP_PREPARSED_DATA preparsed; +}; + +static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) +{ + return CONTAINING_RECORD( CONTAINING_RECORD( iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface ), + struct hid_joystick, base ); +} + +static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct hid_joystick tmp = *impl; + ULONG res; + + if (!(res = IDirectInputDevice2WImpl_Release( iface ))) + { + HidD_FreePreparsedData( tmp.preparsed ); + CloseHandle( tmp.device ); + } + + return res; +} + +static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, DIDEVCAPS *caps ) +{ + FIXME( "iface %p, caps %p stub!\n", iface, caps ); + + if (!caps) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, REFGUID guid, DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, REFGUID guid, const DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Acquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Unacquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) +{ + FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); + + if (!ptr) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, DIDEVICEOBJECTINSTANCEW *instance, + DWORD obj, DWORD how ) +{ + FIXME( "iface %p, instance %p, obj %#x, how %#x stub!\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, REFGUID rguid, + const DIEFFECT *effect, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, rguid %s, effect %p, out %p, outer %p stub!\n", iface, debugstr_guid( rguid ), + effect, out, outer ); + + if (!out) return E_POINTER; + if (!rguid || !effect) return DI_NOEFFECT; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *ref, DWORD type ) +{ + FIXME( "iface %p, callback %p, ref %p, type %#x stub!\n", iface, callback, ref, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, REFGUID guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD flags ) +{ + FIXME( "iface %p, flags %x stub!\n", iface, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + FIXME( "iface %p, format %p, username %s, flags %#x stub!\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SetActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, format %p, username %s, flags %#x.\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return _set_action_map( iface, format, username, flags, impl->base.data_format.wine_df ); +} + +static const IDirectInputDevice8WVtbl hid_joystick_vtbl = +{ + /*** IUnknown methods ***/ + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + hid_joystick_Release, + /*** IDirectInputDevice methods ***/ + hid_joystick_GetCapabilities, + hid_joystick_EnumObjects, + hid_joystick_GetProperty, + hid_joystick_SetProperty, + hid_joystick_Acquire, + hid_joystick_Unacquire, + hid_joystick_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + hid_joystick_GetObjectInfo, + hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + /*** IDirectInputDevice2 methods ***/ + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + IDirectInputDevice2WImpl_Poll, + IDirectInputDevice2WImpl_SendDeviceData, + /*** IDirectInputDevice7 methods ***/ + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + /*** IDirectInputDevice8 methods ***/ + hid_joystick_BuildActionMap, + hid_joystick_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo, +}; + +static HRESULT hid_joystick_device_open( DWORD index, WCHAR *device_path, HANDLE *device, DWORD version, + PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, + HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance ) +{ + RAWINPUTDEVICELIST *list; + DWORD count, i, j; + + GetRawInputDeviceList( NULL, &count, sizeof(*list) ); + if (!(list = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*list) ))) return DIERR_OUTOFMEMORY; + GetRawInputDeviceList( list, &count, sizeof(*list) ); + + for (i = 0; i < count; ++i) if (list[i].dwType == RIM_TYPEHID) break; + for (j = 0; j < index && i < count; ++i) if (list[i].dwType == RIM_TYPEHID) ++j; + if (i == count) + { + HeapFree( GetProcessHeap(), 0, list ); + return DIERR_DEVICENOTREG; + } + + count = MAX_PATH; + GetRawInputDeviceInfoW( list[i].hDevice, RIDI_DEVICENAME, device_path, &count ); + HeapFree( GetProcessHeap(), 0, list ); + + TRACE( "Opening %s\n", debugstr_w(device_path) ); + *device = CreateFileW( device_path, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + *preparsed = NULL; + + if (*device == INVALID_HANDLE_VALUE) return DI_NOTATTACHED; + if (!HidD_GetPreparsedData( *device, preparsed )) goto failed; + if (!HidD_GetAttributes( *device, attrs )) goto failed; + if (HidP_GetCaps( *preparsed, caps ) != HIDP_STATUS_SUCCESS) goto failed; + + if (caps->UsagePage == HID_USAGE_PAGE_GAME) FIXME( "Unimplemented HID game usage page!\n" ); + if (caps->UsagePage == HID_USAGE_PAGE_SIMULATION) FIXME( "Unimplemented HID simulation usage page!\n" ); + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; + if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; + + instance->guidInstance = hid_joystick_guid; + instance->guidInstance.Data3 = index; + instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); + instance->dwDevType = get_device_type( version, caps->Usage != HID_USAGE_GENERIC_GAMEPAD ) | DIDEVTYPE_HID; + instance->guidFFDriver = GUID_NULL; + instance->wUsagePage = caps->UsagePage; + instance->wUsage = caps->Usage; + + if (!HidD_GetProductString( *device, instance->tszInstanceName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( *device, instance->tszProductName, MAX_PATH )) goto failed; + return DI_OK; + +failed: + CloseHandle( *device ); + *device = INVALID_HANDLE_VALUE; + HidD_FreePreparsedData( *preparsed ); + *preparsed = NULL; + return DI_NOTATTACHED; +} + +static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, + DWORD version, int index ) +{ + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + PHIDP_PREPARSED_DATA preparsed; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "type %x, flags %#x, instance %p, version %04x, index %d\n", type, flags, instance, version, index ); + + hr = hid_joystick_device_open( index, device_path, &device, version, + &preparsed, &attrs, &caps, instance ); + if (hr != DI_OK) return hr; + + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return S_FALSE; + if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) + return S_FALSE; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) + return S_FALSE; + + if (device_disabled_registry( "HID", TRUE )) + return DIERR_DEVICENOTREG; + + TRACE( "Found device with usage %04x:%04x, type %x, instance %s %s, product %s %s, ffdriver %s\n", + instance->wUsagePage, instance->wUsage, instance->dwDevType, debugstr_guid( &instance->guidProduct ), + debugstr_w( instance->tszProductName ), debugstr_guid( &instance->guidInstance ), + debugstr_w( instance->tszInstanceName ), debugstr_guid( &instance->guidFFDriver ) ); + + return DI_OK; +} + +static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, REFGUID guid, IDirectInputDevice8W **out ) +{ + DIDEVICEINSTANCEW instance = {sizeof(instance)}; + DWORD index, size = sizeof(struct hid_joystick); + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + struct hid_joystick *impl = NULL; + PHIDP_PREPARSED_DATA preparsed; + DIDATAFORMAT *format = NULL; + WCHAR device_path[MAX_PATH]; + GUID tmp_guid = *guid; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + tmp_guid.Data3 = hid_joystick_guid.Data3; + if (!IsEqualGUID( &hid_joystick_guid, &tmp_guid )) return DIERR_DEVICENOTREG; + index = guid->Data3; + + hr = hid_joystick_device_open( index, device_path, &device, dinput->dwVersion, + &preparsed, &attrs, &caps, &instance ); + if (hr != DI_OK) return hr; + + hr = direct_input_device_alloc( size, &hid_joystick_vtbl, guid, dinput, (void **)&impl ); + if (FAILED(hr)) goto failed; + + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + + impl->device = device; + impl->preparsed = preparsed; + + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) goto failed; + impl->base.data_format.wine_df = format; + + TRACE( "Created %p\n", impl ); + + *out = &impl->base.IDirectInputDevice8W_iface; + return DI_OK; + +failed: + HeapFree( GetProcessHeap(), 0, format ); + HeapFree( GetProcessHeap(), 0, impl ); + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + return hr; +} + +const struct dinput_device joystick_hid_device = +{ + "Wine HID joystick driver", + hid_joystick_enum_device, + hid_joystick_create_device, +}; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3215978c995..312ef3d9c42 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -175,7 +175,7 @@ static INT find_joystick_devices(void) /* Append driver name */ strcat(joydev.name, JOYDEVDRIVER); - if (device_disabled_registry(joydev.name)) { + if (device_disabled_registry(joydev.name, FALSE)) { close(fd); continue; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2b970271ec3..558c8cc19e5 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -264,7 +264,7 @@ static void find_joydevs(void) else joydev.name = joydev.device; - if (device_disabled_registry(joydev.name)) { + if (device_disabled_registry(joydev.name, FALSE)) { close(fd); HeapFree(GetProcessHeap(), 0, joydev.name); if (joydev.name != joydev.device) diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 874bf3e69a7..9cc30605234 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -57,7 +57,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; -BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; +BOOL device_disabled_registry(const char* name, BOOL disable) DECLSPEC_HIDDEN; ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface); diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 35b3bfb75f5..71eecd770b3 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput @@ -13,6 +13,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ -- 2.32.0

3 8

[PATCH v2 1/7] ws2_32: Handle SO_RCVTIMEO in the server.
by Zebediah Figura 29 Jun '21

29 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: cast timeout to 64 bits before multiplying dlls/ws2_32/socket.c | 10 +++++----- dlls/ws2_32/tests/sock.c | 8 ++++---- include/wine/afd.h | 2 ++ server/sock.c | 40 +++++++++++++++++++++++++++++++++------- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7ed48124a5a..15c9d0cc940 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2289,6 +2289,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVBUF, optval, optlen ); case WS_SO_RCVTIMEO: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVTIMEO, optval, optlen ); + case WS_SO_SNDTIMEO: { INT64 timeout; @@ -3565,6 +3567,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_RCVBUF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVBUF, optval, optlen ); + case WS_SO_RCVTIMEO: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVTIMEO, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3631,13 +3636,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, TRACE("setting global SO_OPENTYPE = 0x%x\n", *((const int*)optval) ); return 0; -#ifdef SO_RCVTIMEO - case WS_SO_RCVTIMEO: -#endif #ifdef SO_SNDTIMEO case WS_SO_SNDTIMEO: -#endif -#if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO) if (optval && optlen == sizeof(UINT32)) { /* WinSock passes milliseconds instead of struct timeval */ tval.tv_usec = (*(const UINT32*)optval % 1000) * 1000; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ccaa04e4ef5..a3f7e002ce7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10919,7 +10919,7 @@ static void test_timeout(void) WSASetLastError(0xdeadbeef); ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(len == sizeof(timeout), "got size %u\n", len); ok(!timeout, "got timeout %u\n", timeout); @@ -10927,15 +10927,15 @@ static void test_timeout(void) WSASetLastError(0xdeadbeef); ret = setsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); timeout = 0xdeadbeef; len = sizeof(timeout); WSASetLastError(0xdeadbeef); ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); - todo_wine ok(timeout == 100, "got timeout %u\n", timeout); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(timeout == 100, "got timeout %u\n", timeout); WSASetLastError(0xdeadbeef); ret = recv(client, &buffer, 1, 0); diff --git a/include/wine/afd.h b/include/wine/afd.h index 0692394459e..c4f7c7a6413 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -171,6 +171,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 8bad31efdd1..94dbafe44ee 100644 --- a/server/sock.c +++ b/server/sock.c @@ -208,6 +208,7 @@ struct sock union win_sockaddr addr; /* socket name */ int addr_len; /* socket name length */ unsigned int rcvbuf; /* advisory recv buffer size */ + unsigned int rcvtimeo; /* receive timeout in ms */ unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ @@ -1388,6 +1389,7 @@ static struct sock *create_socket(void) sock->nonblocking = 0; sock->bound = 0; sock->rcvbuf = 0; + sock->rcvtimeo = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -2619,6 +2621,35 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_RCVTIMEO: + { + DWORD rcvtimeo = sock->rcvtimeo; + + if (get_reply_max_size() < sizeof(rcvtimeo)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &rcvtimeo, sizeof(rcvtimeo) ); + return 1; + } + + case IOCTL_AFD_WINE_SET_SO_RCVTIMEO: + { + DWORD rcvtimeo; + + if (get_req_data_size() < sizeof(rcvtimeo)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + rcvtimeo = *(DWORD *)get_req_data(); + + sock->rcvtimeo = rcvtimeo; + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -3029,19 +3060,14 @@ DECL_HANDLER(recv_socket) /* recv() returned EWOULDBLOCK, i.e. no data available yet */ if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) { -#ifdef SO_RCVTIMEO - struct timeval tv; - socklen_t len = sizeof(tv); - /* Set a timeout on the async if necessary. * * We want to do this *only* if the client gave us STATUS_DEVICE_NOT_READY. * If the client gave us STATUS_PENDING, it expects the async to always * block (it was triggered by WSARecv*() with a valid OVERLAPPED * structure) and for the timeout not to be respected. */ - if (is_fd_overlapped( fd ) && !getsockopt( get_unix_fd( fd ), SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, &len )) - timeout = tv.tv_sec * -10000000 + tv.tv_usec * -10; -#endif + if (is_fd_overlapped( fd )) + timeout = (timeout_t)sock->rcvtimeo * -10000; status = STATUS_PENDING; } -- 2.30.2

4 10

[PATCH v2] shell32/tests: Fix the known folder relative path check for multiple CD drives.
by Francois Gouget 29 Jun '21

29 Jun '21

When there is more than one CD drive the extra drives typically get a folder called "Burn1", etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fixed the signed-off-by. dlls/shell32/tests/shellpath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 62fa68eb20a..ea6f92ce827 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2067,7 +2067,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId debugstr_w(ikf_path), debugstr_w(ikf_parent_path)); ok_(__FILE__, known_folder->line)(*(ikf_path + lstrlenW(ikf_parent_path)) == '\\', "Missing slash\n"); - ok_(__FILE__, known_folder->line)(wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0, + ok_(__FILE__, known_folder->line)( + wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0 || + /* With multiple drives, there are multiple CD-burning folders */ + (IsEqualGUID(folderId, &FOLDERID_CDBurning) && + wcsnicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1, wcslen(kfd.pszRelativePath)) == 0), "Full path %s does not end with relative path %s\n", debugstr_w(ikf_path), debugstr_w(kfd.pszRelativePath)); -- 2.20.1

1 0

[PATCH] shell32/tests: Fix the known folder relative path check for multiple CD drives.
by Francois Gouget 29 Jun '21

29 Jun '21

When there is more than one CD drive the extra drives typically get a folder called "Burn1", etc. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- dlls/shell32/tests/shellpath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 62fa68eb20a..ea6f92ce827 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2067,7 +2067,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId debugstr_w(ikf_path), debugstr_w(ikf_parent_path)); ok_(__FILE__, known_folder->line)(*(ikf_path + lstrlenW(ikf_parent_path)) == '\\', "Missing slash\n"); - ok_(__FILE__, known_folder->line)(wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0, + ok_(__FILE__, known_folder->line)( + wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0 || + /* With multiple drives, there are multiple CD-burning folders */ + (IsEqualGUID(folderId, &FOLDERID_CDBurning) && + wcsnicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1, wcslen(kfd.pszRelativePath)) == 0), "Full path %s does not end with relative path %s\n", debugstr_w(ikf_path), debugstr_w(kfd.pszRelativePath)); -- 2.20.1

1 0

[PATCH] reg/tests: Test use of registry views with the 'query' operation
by Hugh McMaster 29 Jun '21

29 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/query.c | 181 +++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index f5ba32f97e3..590d322c37c 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -132,6 +132,16 @@ static void test_command_syntax(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Test registry view */ + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:32 /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:32 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:64 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_query(void) @@ -296,6 +306,165 @@ static void test_query(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } +static const char *test9a = "\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\\subkey\r\n"; + +static const char *test9b = "\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\\subkey\r\n" + " Test3 REG_SZ Some string data\r\n" + " Test4 REG_DWORD 0xabc\r\n" + " Wine REG_SZ Second instance\r\n\r\n"; + +static void create_test_key(REGSAM sam) +{ + HKEY hkey, subkey; + DWORD dword; + + add_key(HKEY_LOCAL_MACHINE, KEY_BASE, sam, &hkey); + add_value(hkey, "Test1", REG_SZ, "Hello, World", 13); + dword = 0x123; + add_value(hkey, "Test2", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "Wine", REG_SZ, "First instance", 15); + + add_key(hkey, "subkey", sam, &subkey); + add_value(subkey, "Test3", REG_SZ, "Some string data", 16); + dword = 0xabc; + add_value(subkey, "Test4", REG_DWORD, &dword, sizeof(dword)); + add_value(subkey, "Wine", REG_SZ, "Second instance", 16); + + close_key(subkey); + close_key(hkey); +} + +static void test_registry_view_win32(void) +{ + BOOL is_wow64, is_win32; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (32-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 64-bit registry view, which doesn't exist on 32-bit Windows */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_win64(void) +{ + BOOL is_wow64, is_win64; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, TODO_REG_COMPARE); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try querying the 64-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_wow64(void) +{ + BOOL is_wow64; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try querying the 64-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, TODO_REG_COMPARE); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + START_TEST(query) { DWORD r; @@ -307,4 +476,16 @@ START_TEST(query) test_command_syntax(); test_query(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); } -- 2.32.0

1 0

[PATCH 4/4] gdi32: Delay writing to enhanced metafile file until CreateEnhMetaFile is called.
by Jacek Caban 29 Jun '21

29 Jun '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/init.c | 41 ++++++++++--------------------------- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 11 insertions(+), 32 deletions(-)

2 1

[PATCH 3/4] gdi32: Remove no longer used disk-based metafile special-cases.
by Jacek Caban 29 Jun '21

29 Jun '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/metafile.c | 79 ++-------------------------------------- dlls/gdi32/mfdrv/init.c | 10 +---- 3 files changed, 5 insertions(+), 85 deletions(-)

2 1

[PATCH 2/4] gdi32: Delay writing metafile file until CloseMetaFile is called.
by Jacek Caban 29 Jun '21

29 Jun '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/init.c | 50 +++++++++---------------------------- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 12 insertions(+), 40 deletions(-)

2 1

[PATCH 1/4] gdi32/tests: Add metafile file creation tests.
by Jacek Caban 29 Jun '21

29 Jun '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 171 ++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+)

2 1

[PATCH] d3d11&d3d10core/tests: Increase the tolerance in test_texture_compressed_3d().
by Francois Gouget 29 Jun '21

29 Jun '21

This fixes failures on Nvidia GeForce GTX 560 graphics cards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51340 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 1eee482cc8f..2014e8edc94 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19068,7 +19068,7 @@ static void test_texture_compressed_3d(void) } expected |= 0xff000000; colour = get_readback_color(&rb, (x * 640 + 128) / 256, (y * 480 + 128) / 256); - if (!(equal = compare_color(colour, expected, 2))) + if (!(equal = compare_color(colour, expected, 8))) break; } if (!equal) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2d66f9bde73..a2858ed0155 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33420,7 +33420,7 @@ static void test_texture_compressed_3d(void) } expected |= 0xff000000; colour = get_readback_color(&rb, (x * 640 + 128) / 256, (y * 480 + 128) / 256, 0); - if (!(equal = compare_color(colour, expected, 2))) + if (!(equal = compare_color(colour, expected, 8))) break; } if (!equal) -- 2.20.1

3 2

[PATCH v2 1/3] wined3d: Create buffers with a format of WINED3DFMT_R8_UNORM.
by Zebediah Figura 29 Jun '21

29 Jun '21

Allow things like wined3d_format_copy_data() to work on them. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 00d219a49f2..0511f278144 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -849,7 +849,7 @@ static HRESULT buffer_resource_sub_resource_get_desc(struct wined3d_resource *re return E_INVALIDARG; } - desc->format = WINED3DFMT_UNKNOWN; + desc->format = WINED3DFMT_R8_UNORM; desc->multisample_type = WINED3D_MULTISAMPLE_NONE; desc->multisample_quality = 0; desc->usage = resource->usage; @@ -1156,7 +1156,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->bind_flags); + const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_R8_UNORM, desc->bind_flags); struct wined3d_resource *resource = &buffer->resource; HRESULT hr; -- 2.30.2

2 5

[PATCH v2] wined3d: Avoid ending the renderpass when issuing a query.
by Jan Sikorski 29 Jun '21

29 Jun '21

Allocate a fresh query index that does not need to be reset. Reset query pools at creation and when the render pass is ended. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v2: - changed list beheading to LIST_FOR_EACH_ENTRY_SAFE - naming (dirty -> completed) - added an explanatory comment - whitespace fix --- dlls/wined3d/context_vk.c | 19 +++++++++++-- dlls/wined3d/query.c | 50 ++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 6 +++- 3 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 43b806a19b5..87fcb868197 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1282,12 +1282,12 @@ VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *conte void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *context_vk) { + VkCommandBuffer vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; const struct wined3d_vk_info *vk_info = context_vk->vk_info; - VkCommandBuffer vk_command_buffer; + struct wined3d_query_pool_vk *pool_vk, *pool_vk_next; if (context_vk->vk_render_pass) { - vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; VK_CALL(vkCmdEndRenderPass(vk_command_buffer)); context_vk->vk_render_pass = VK_NULL_HANDLE; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, @@ -1300,6 +1300,14 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte context_vk->vk_framebuffer, context_vk->current_command_buffer.id); context_vk->vk_framebuffer = VK_NULL_HANDLE; } + + LIST_FOR_EACH_ENTRY_SAFE(pool_vk, pool_vk_next, &context_vk->completed_query_pools, + struct wined3d_query_pool_vk, completed_entry) + { + list_remove(&pool_vk->completed_entry); + list_init(&pool_vk->completed_entry); + wined3d_query_pool_vk_reset(pool_vk, context_vk, vk_command_buffer); + } } static void wined3d_context_vk_destroy_render_pass(struct wine_rb_entry *entry, void *ctx) @@ -1330,6 +1338,7 @@ static void wined3d_context_vk_destroy_query_pools(struct wined3d_context_vk *co bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct wined3d_query_pool_idx_vk *pool_idx) { + const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_query_pool_vk *pool_vk, *entry; struct list *free_pools; size_t idx; @@ -1376,6 +1385,10 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, return false; } + wined3d_context_vk_end_current_render_pass(context_vk); + VK_CALL(vkCmdResetQueryPool(wined3d_context_vk_get_command_buffer(context_vk), + pool_vk->vk_query_pool, 0, WINED3D_QUERY_POOL_SIZE)); + if (!wined3d_query_pool_vk_allocate_query(pool_vk, &idx)) { wined3d_query_pool_vk_cleanup(pool_vk, context_vk); @@ -1449,7 +1462,6 @@ void wined3d_context_vk_remove_pending_queries(struct wined3d_context_vk *contex { if (p->query_vk != query_vk && !wined3d_query_vk_accumulate_data(p->query_vk, context_vk, &p->pool_idx)) continue; - wined3d_query_pool_vk_free_query(p->pool_idx.pool_vk, p->pool_idx.idx); --p->query_vk->pending_count; } @@ -3390,6 +3402,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi wined3d_context_vk_init_graphics_pipeline_key(context_vk); list_init(&context_vk->active_queries); + list_init(&context_vk->completed_query_pools); list_init(&context_vk->free_occlusion_query_pools); list_init(&context_vk->free_timestamp_query_pools); list_init(&context_vk->free_pipeline_statistics_query_pools); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 81f5ba7d0d7..1e082f8ffae 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1348,12 +1348,15 @@ HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_quer } } -void wined3d_query_pool_vk_free_query(struct wined3d_query_pool_vk *pool_vk, size_t idx) +static void wined3d_query_pool_vk_mark_complete(struct wined3d_query_pool_vk *pool_vk, size_t idx, + struct wined3d_context_vk *context_vk) { - wined3d_bitmap_clear(pool_vk->allocated, idx); - - if (list_empty(&pool_vk->entry)) - list_add_tail(pool_vk->free_list, &pool_vk->entry); + /* Don't reset completed queries right away, as vkCmdResetQueryPool() needs to happen + * outside of a render pass. Queue the query to be reset in wined3d_query_pool_vk_reset() + * instead, which is called when the render pass ends. */ + wined3d_bitmap_set(pool_vk->completed, idx); + if (list_empty(&pool_vk->completed_entry)) + list_add_tail(&context_vk->completed_query_pools, &pool_vk->completed_entry); } bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) @@ -1372,6 +1375,29 @@ void wined3d_query_pool_vk_cleanup(struct wined3d_query_pool_vk *pool_vk, struct VK_CALL(vkDestroyQueryPool(device_vk->vk_device, pool_vk->vk_query_pool, NULL)); list_remove(&pool_vk->entry); + list_remove(&pool_vk->completed_entry); +} + +void wined3d_query_pool_vk_reset(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer) +{ + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + unsigned int start = 0, idx; + struct wined3d_range range; + + for (;;) + { + if (!wined3d_bitmap_get_range(pool_vk->completed, WINED3D_QUERY_POOL_SIZE, start, &range)) + break; + + VK_CALL(vkCmdResetQueryPool(vk_command_buffer, pool_vk->vk_query_pool, range.offset, range.size)); + start = range.offset + range.size; + for (idx = range.offset; idx < start; ++idx) + wined3d_bitmap_clear(pool_vk->allocated, idx); + } + memset(pool_vk->completed, 0, sizeof(pool_vk->completed)); + if (list_empty(&pool_vk->entry)) + list_add_tail(pool_vk->free_list, &pool_vk->entry); } bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, @@ -1383,6 +1409,7 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, VkResult vr; list_init(&pool_vk->entry); + list_init(&pool_vk->completed_entry); pool_vk->free_list = free_pools; pool_info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO; @@ -1468,6 +1495,8 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, if (vr == VK_NOT_READY) return false; + wined3d_query_pool_vk_mark_complete(pool_idx->pool_vk, pool_idx->idx, context_vk); + result = (void *)query_vk->q.data; switch (query_vk->q.type) { @@ -1519,8 +1548,7 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, struct wined3d_query_pool_vk *pool_vk; size_t idx; - if (!query_vk->pool_idx.pool_vk - && !wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) { ERR("Failed to allocate new query.\n"); return; @@ -1528,7 +1556,6 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, pool_vk = query_vk->pool_idx.pool_vk; idx = query_vk->pool_idx.idx; - VK_CALL(vkCmdResetQueryPool(vk_command_buffer, pool_vk->vk_query_pool, idx, 1)); if (query_vk->q.type >= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 && query_vk->q.type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) VK_CALL(vkCmdBeginQueryIndexedEXT(vk_command_buffer, pool_vk->vk_query_pool, idx, @@ -1599,6 +1626,7 @@ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) if (query_vk->pool_idx.pool_vk && !wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pool_idx)) goto unavailable; + query_vk->pool_idx.pool_vk = NULL; context_release(&context_vk->c); return TRUE; @@ -1622,7 +1650,6 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - wined3d_context_vk_end_current_render_pass(context_vk); list_remove(&query_vk->entry); if (query_vk->pending_count) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); @@ -1633,6 +1660,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); list_remove(&query_vk->entry); } + if (query_vk->pool_idx.pool_vk) + wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, + query_vk->pool_idx.idx, context_vk); wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); list_add_head(&context_vk->active_queries, &query_vk->entry); query_vk->started = true; @@ -1669,8 +1699,6 @@ static void wined3d_query_vk_destroy(struct wined3d_query *query) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); context_release(&context_vk->c); } - if (query_vk->pool_idx.pool_vk) - wined3d_query_pool_vk_free_query(query_vk->pool_idx.pool_vk, query_vk->pool_idx.idx); heap_free(query_vk); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84dad38f0c9..58fbc69ca7c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2023,16 +2023,19 @@ struct wined3d_pipeline_statistics_query struct wined3d_query_pool_vk { struct list entry; + struct list completed_entry; struct list *free_list; VkQueryPool vk_query_pool; uint32_t allocated[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; + uint32_t completed[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; }; bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) DECLSPEC_HIDDEN; void wined3d_query_pool_vk_cleanup(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -void wined3d_query_pool_vk_free_query(struct wined3d_query_pool_vk *pool_vk, size_t idx) DECLSPEC_HIDDEN; +void wined3d_query_pool_vk_reset(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer) DECLSPEC_HIDDEN; bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct list *free_pools) DECLSPEC_HIDDEN; @@ -2574,6 +2577,7 @@ struct wined3d_context_vk struct list active_queries; struct wined3d_pending_queries_vk pending_queries; + struct list completed_query_pools; struct list free_occlusion_query_pools; struct list free_timestamp_query_pools; struct list free_pipeline_statistics_query_pools; -- 2.30.2

2 1

[PATCH] secur32: Use blocking mode for DTLS sessions.
by Hans Leidekker 29 Jun '21

29 Jun '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 7 +------ dlls/secur32/schannel_gnutls.c | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9c7e98b32a4..515f01d08a3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -879,11 +879,6 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } -static inline BOOL is_dtls_context(const struct schan_context *ctx) -{ - return (ctx->header_size == HEADER_SIZE_DTLS); -} - /*********************************************************************** * InitializeSecurityContextW */ @@ -1011,7 +1006,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INCOMPLETE_MESSAGE; } } - else if (!is_dtls_context(ctx)) return SEC_E_INCOMPLETE_MESSAGE; + else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 03124924644..bcf38e3f23f 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,10 +292,6 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - struct schan_transport *t = (struct schan_transport *)transport; - SIZE_T count = 0; - - if (callbacks->get_buffer(t, &t->in, &count)) return 1; return 0; } @@ -309,7 +305,7 @@ static BOOL CDECL schan_create_session(schan_session *session, schan_credentials if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) { - flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; + flags |= GNUTLS_DATAGRAM; } err = pgnutls_init(s, flags); -- 2.30.2

1 0

running as root broken in 6.10
by Peter Dons Tychsen 29 Jun '21

29 Jun '21

Hello all, I have a specific case where i need to run wine as root, even though its not advised (i know). This used to work fine. In 6.10 this does not work any more. I get this for any command (e.g. winecfg): wine: could not load kernel32.dll, status c0000135 System: 5.12.11-200.fc33.x86_64 (fedora). WIne: wine-6.10 (Staging) I have tried cleaning prefixes, rebooting, reinstalling wine. For normal users it works great. Anyone know why this does not work any more? Thanks, /pedro

3 5

[PATCH] dinput: Introduce new HID joystick backend.
by Rémi Bernon 29 Jun '21

29 Jun '21

This adds a new joystick backend, implemented on top of HID and without any host dependencies. This will be progressively implementated, and it's not going to be usable until at least a few more patches. Because of that, and because it may also introduce regressions compared to the existing backends, it is possible to disable it entirely using the following global registry key: [HKCU\\Software\\Wine\\DirectInput\\Joysticks] "HID"="disabled" Or using the corresponding AppDefaults registry key: [HKCU\\Software\\Wine\\AppDefaults\\<app.exe>\\DirectInput\\Joysticks] "HID"="disabled" Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/Makefile.in | 3 +- dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick_hid.c | 450 +++++++++++++++++++++++++++++++++++ dlls/dinput8/Makefile.in | 3 +- 5 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 dlls/dinput/joystick_hid.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index a22c8a72180..f2347927ed6 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) @@ -12,6 +12,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c7b932aca44..88ee1855675 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -80,7 +80,8 @@ static const struct dinput_device *dinput_devices[] = &keyboard_device, &joystick_linuxinput_device, &joystick_linux_device, - &joystick_osx_device + &joystick_osx_device, + &joystick_hid_device, }; HINSTANCE DINPUT_instance; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 7e0f56c68df..c11b64585d9 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -67,6 +67,7 @@ struct DevicePlayer { extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c new file mode 100644 index 00000000000..53448c6dafb --- /dev/null +++ b/dlls/dinput/joystick_hid.c @@ -0,0 +1,450 @@ +/* DirectInput HID Joystick device + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" + +#include "ddk/hidsdi.h" +#include "devguid.h" +#include "dinput.h" +#include "setupapi.h" + +#include "wine/debug.h" + +#include "dinput_private.h" +#include "device_private.h" +#include "joystick_private.h" + +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); + +struct hid_joystick +{ + IDirectInputDeviceImpl base; + + HANDLE device; + PHIDP_PREPARSED_DATA preparsed; +}; + +static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) +{ + return CONTAINING_RECORD( CONTAINING_RECORD( iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface ), + struct hid_joystick, base ); +} + +static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct hid_joystick tmp = *impl; + ULONG res; + + if (!(res = IDirectInputDevice2WImpl_Release( iface ))) + { + HidD_FreePreparsedData( tmp.preparsed ); + CloseHandle( tmp.device ); + } + + return res; +} + +static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, DIDEVCAPS *caps ) +{ + FIXME( "iface %p, caps %p stub!\n", iface, caps ); + + if (!caps) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, REFGUID guid, DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, REFGUID guid, const DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Acquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Unacquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) +{ + FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); + + if (!ptr) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, DIDEVICEOBJECTINSTANCEW *instance, + DWORD obj, DWORD how ) +{ + FIXME( "iface %p, instance %p, obj %#x, how %#x stub!\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, REFGUID rguid, + const DIEFFECT *effect, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, rguid %s, effect %p, out %p, outer %p stub!\n", iface, debugstr_guid( rguid ), + effect, out, outer ); + + if (!out) return E_POINTER; + if (!rguid || !effect) return DI_NOEFFECT; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *ref, DWORD type ) +{ + FIXME( "iface %p, callback %p, ref %p, type %#x stub!\n", iface, callback, ref, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, REFGUID guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD flags ) +{ + FIXME( "iface %p, flags %x stub!\n", iface, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + FIXME( "iface %p, format %p, username %s, flags %#x stub!\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SetActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, format %p, username %s, flags %#x.\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return _set_action_map( iface, format, username, flags, impl->base.data_format.wine_df ); +} + +static const IDirectInputDevice8WVtbl hid_joystick_vtbl = +{ + /*** IUnknown methods ***/ + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + hid_joystick_Release, + /*** IDirectInputDevice methods ***/ + hid_joystick_GetCapabilities, + hid_joystick_EnumObjects, + hid_joystick_GetProperty, + hid_joystick_SetProperty, + hid_joystick_Acquire, + hid_joystick_Unacquire, + hid_joystick_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + hid_joystick_GetObjectInfo, + hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + /*** IDirectInputDevice2 methods ***/ + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + IDirectInputDevice2WImpl_Poll, + IDirectInputDevice2WImpl_SendDeviceData, + /*** IDirectInputDevice7 methods ***/ + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + /*** IDirectInputDevice8 methods ***/ + hid_joystick_BuildActionMap, + hid_joystick_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo, +}; + +static HRESULT hid_joystick_device_open( DWORD index, WCHAR *device_path, HANDLE *device, DWORD version, + PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, + HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance ) +{ + RAWINPUTDEVICELIST *list; + DWORD count, i, j; + + GetRawInputDeviceList( NULL, &count, sizeof(*list) ); + if (!(list = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*list) ))) return DIERR_OUTOFMEMORY; + GetRawInputDeviceList( list, &count, sizeof(*list) ); + + for (i = 0; i < count; ++i) if (list[i].dwType == RIM_TYPEHID) break; + for (j = 0; j < index && i < count; ++i) if (list[i].dwType == RIM_TYPEHID) ++j; + if (i == count) + { + HeapFree( GetProcessHeap(), 0, list ); + return DIERR_DEVICENOTREG; + } + + count = MAX_PATH; + GetRawInputDeviceInfoW( list[i].hDevice, RIDI_DEVICENAME, device_path, &count ); + HeapFree( GetProcessHeap(), 0, list ); + + TRACE( "Opening %s\n", debugstr_w(device_path) ); + *device = CreateFileW( device_path, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + *preparsed = NULL; + + if (*device == INVALID_HANDLE_VALUE) return DI_NOTATTACHED; + if (!HidD_GetPreparsedData( *device, preparsed )) goto failed; + if (!HidD_GetAttributes( *device, attrs )) goto failed; + if (HidP_GetCaps( *preparsed, caps ) != HIDP_STATUS_SUCCESS) goto failed; + + if (caps->UsagePage == HID_USAGE_PAGE_GAME) FIXME( "Unimplemented HID game usage page!\n" ); + if (caps->UsagePage == HID_USAGE_PAGE_SIMULATION) FIXME( "Unimplemented HID simulation usage page!\n" ); + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; + if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; + + instance->guidInstance = hid_joystick_guid; + instance->guidInstance.Data3 = index; + instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); + instance->dwDevType = get_device_type( version, caps->Usage != HID_USAGE_GENERIC_GAMEPAD ) | DIDEVTYPE_HID; + instance->guidFFDriver = GUID_NULL; + instance->wUsagePage = caps->UsagePage; + instance->wUsage = caps->Usage; + + if (!HidD_GetProductString( *device, instance->tszInstanceName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( *device, instance->tszProductName, MAX_PATH )) goto failed; + return DI_OK; + +failed: + CloseHandle( *device ); + *device = INVALID_HANDLE_VALUE; + HidD_FreePreparsedData( *preparsed ); + *preparsed = NULL; + return DI_NOTATTACHED; +} + +static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, + DWORD version, int index ) +{ + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + PHIDP_PREPARSED_DATA preparsed; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "type %x, flags %#x, instance %p, version %04x, index %d\n", type, flags, instance, version, index ); + + hr = hid_joystick_device_open( index, device_path, &device, version, + &preparsed, &attrs, &caps, instance ); + if (hr != DI_OK) return hr; + + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return S_FALSE; + if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) + return S_FALSE; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) + return S_FALSE; + + if (device_disabled_registry( "HID" )) + return DIERR_DEVICENOTREG; + + TRACE( "Found device with usage %04x:%04x, type %x, instance %s %s, product %s %s, ffdriver %s\n", + instance->wUsagePage, instance->wUsage, instance->dwDevType, debugstr_guid( &instance->guidProduct ), + debugstr_w( instance->tszProductName ), debugstr_guid( &instance->guidInstance ), + debugstr_w( instance->tszInstanceName ), debugstr_guid( &instance->guidFFDriver ) ); + + return DI_OK; +} + +static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, REFGUID guid, IDirectInputDevice8W **out ) +{ + DIDEVICEINSTANCEW instance = {sizeof(instance)}; + DWORD index, size = sizeof(struct hid_joystick); + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + struct hid_joystick *impl = NULL; + PHIDP_PREPARSED_DATA preparsed; + DIDATAFORMAT *format = NULL; + WCHAR device_path[MAX_PATH]; + GUID tmp_guid = *guid; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + tmp_guid.Data3 = hid_joystick_guid.Data3; + if (!IsEqualGUID( &hid_joystick_guid, &tmp_guid )) return DIERR_DEVICENOTREG; + index = guid->Data3; + + hr = hid_joystick_device_open( index, device_path, &device, dinput->dwVersion, + &preparsed, &attrs, &caps, &instance ); + if (hr != DI_OK) return hr; + + hr = direct_input_device_alloc( size, &hid_joystick_vtbl, guid, dinput, (void **)&impl ); + if (FAILED(hr)) goto failed; + + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + + impl->device = device; + impl->preparsed = preparsed; + + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) goto failed; + impl->base.data_format.wine_df = format; + + TRACE( "Created %p\n", impl ); + + *out = &impl->base.IDirectInputDevice8W_iface; + return DI_OK; + +failed: + HeapFree( GetProcessHeap(), 0, format ); + HeapFree( GetProcessHeap(), 0, impl ); + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + return hr; +} + +const struct dinput_device joystick_hid_device = +{ + "Wine HID joystick driver", + hid_joystick_enum_device, + hid_joystick_create_device, +}; diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 35b3bfb75f5..71eecd770b3 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput @@ -13,6 +13,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ -- 2.32.0

1 1

[PATCH 1/2] winebus.sys: Add missing keyboard free_device callback.
by Rémi Bernon 29 Jun '21

29 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Luckily(?) this didn't cause a crash because of the typo from PATCH 2. dlls/winebus.sys/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index a512015d478..75173e77cde 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -542,6 +542,10 @@ static void mouse_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static void keyboard_free_device(DEVICE_OBJECT *device) +{ +} + static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -596,6 +600,7 @@ static NTSTATUS keyboard_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYT static const platform_vtbl keyboard_vtbl = { + .free_device = keyboard_free_device, .get_reportdescriptor = keyboard_get_reportdescriptor, .get_string = keyboard_get_string, .begin_report_processing = keyboard_begin_report_processing, -- 2.32.0

1 1

[PATCH] winhttp: Added stubs to function request_set_option.
by Alexander Fischer 29 Jun '21

29 Jun '21

WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE and WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE, (defined in include/winhttp.h) weren't handled yet, which caused 'Amazon Games App' downloads to fail. With these stubs downloads now work. Signed-off-by: Alexander Fischer <fischeralex1993(a)gmail.com> --- dlls/winhttp/session.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index dcea874306a..e4e8f1cec56 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1041,6 +1041,14 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b SetLastError(ERROR_INVALID_PARAMETER); return FALSE; + case WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE: + FIXME("WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE\n"); + return TRUE; + + case WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE: + FIXME("WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE\n"); + return TRUE; + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); -- 2.32.0

2 1

[PATCH 5/5] nsi: Implement NsiEnumerateObjectsAllParameterEx().
by Huw Davies 29 Jun '21

29 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d3292af9ee3..981fcdba954 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -25,10 +25,16 @@ #include "iptypes.h" #include "netiodef.h" #include "wine/nsi.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static inline HANDLE get_nsi_device( void ) +{ + return CreateFileW( L"\\\\.\\Nsi", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); +} + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) @@ -46,7 +52,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ struct nsi_enumerate_all_ex params; DWORD err; - FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + TRACE( "%d %d %p %d %p %d %p %d %p %d %p %d %p\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); params.unknown[0] = 0; @@ -72,7 +78,52 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD out_size, received, err = ERROR_SUCCESS; + HANDLE device = get_nsi_device(); + struct nsiproxy_enumerate_all in; + BYTE *out, *ptr; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + out_size = sizeof(DWORD) + + (params->key_size + params->rw_size + params->dynamic_size + params->static_size) * params->count; + + out = heap_alloc( out_size ); + if (!out) + { + CloseHandle( device ); + return ERROR_OUTOFMEMORY; + } + + in.module = *params->module; + in.first_arg = params->first_arg; + in.second_arg = params->second_arg; + in.table = params->table; + in.key_size = params->key_size; + in.rw_size = params->rw_size; + in.dynamic_size = params->dynamic_size; + in.static_size = params->static_size; + in.count = params->count; + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_ENUMERATE_ALL, &in, sizeof(in), out, out_size, &received, NULL )) + err = GetLastError(); + if (err == ERROR_SUCCESS || err == ERROR_MORE_DATA) + { + params->count = *(DWORD *)out; + ptr = out + sizeof(DWORD); + if (params->key_size) memcpy( params->key_data, ptr, params->key_size * params->count ); + ptr += params->key_size * in.count; + if (params->rw_size) memcpy( params->rw_data, ptr, params->rw_size * params->count ); + ptr += params->rw_size * in.count; + if (params->dynamic_size) memcpy( params->dynamic_data, ptr, params->dynamic_size * params->count ); + ptr += params->dynamic_size * in.count; + if (params->static_size) memcpy( params->static_data, ptr, params->static_size * params->count ); + } + + heap_free( out ); + CloseHandle( device ); + + return err; } void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) -- 2.23.0

1 0

[PATCH 4/5] nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ENUMERATE_ALL.
by Huw Davies 29 Jun '21

29 Jun '21

This differs from native, which passes struct nsi_enumerate_all_ex directly and relies on the kernel being able to access the user-space addresses. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/device.c | 54 ++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 38 ++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 21 +++++++++++ include/wine/nsi.h | 20 +++++++++++ 5 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 dlls/nsiproxy.sys/nsi.c create mode 100644 dlls/nsiproxy.sys/nsiproxy_private.h diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index d1913671f49..f382689d463 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -3,4 +3,5 @@ IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ - device.c + device.c \ + nsi.c diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index ecd584bd1cb..4ce5ddd6d83 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -28,10 +28,60 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" #include "wine/debug.h" +#include "nsiproxy_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static void nsiproxy_enumerate_all( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_enumerate_all *in = (struct nsiproxy_enumerate_all *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + void *out = irp->AssociatedIrp.SystemBuffer; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + struct nsi_enumerate_all_ex enum_all; + + if (in_len != sizeof(*in)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + if (out_len < sizeof(DWORD) + (in->key_size + in->rw_size + in->dynamic_size + in->static_size) * in->count) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + enum_all.unknown[0] = 0; + enum_all.unknown[1] = 0; + enum_all.first_arg = in->first_arg; + enum_all.second_arg = in->second_arg; + enum_all.module = &in->module; + enum_all.table = in->table; + enum_all.key_data = (BYTE *)out + sizeof(DWORD); + enum_all.key_size = in->key_size; + enum_all.rw_data = (BYTE *)enum_all.key_data + in->key_size * in->count; + enum_all.rw_size = in->rw_size; + enum_all.dynamic_data = (BYTE *)enum_all.rw_data + in->rw_size * in->count; + enum_all.dynamic_size = in->dynamic_size; + enum_all.static_data = (BYTE *)enum_all.dynamic_data + in->dynamic_size * in->count; + enum_all.static_size = in->static_size; + enum_all.count = in->count; + + irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); + if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_MORE_ENTRIES) + { + irp->IoStatus.Information = out_len; + *(DWORD *)out = enum_all.count; + } + else irp->IoStatus.Information = 0; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -43,6 +93,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_NSIPROXY_WINE_ENUMERATE_ALL: + nsiproxy_enumerate_all( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c new file mode 100644 index 00000000000..7ff36c093ba --- /dev/null +++ b/dlls/nsiproxy.sys/nsi.c @@ -0,0 +1,38 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "nsiproxy_private.h" + +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) +{ + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h new file mode 100644 index 00000000000..19b520d17cc --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -0,0 +1,21 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * 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 + */ + +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 31ece41d22f..799485fc284 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,8 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +#include "winioctl.h" + /* Undocumented NSI NDIS tables */ #define NSI_NDIS_IFINFO_TABLE 0 #define NSI_NDIS_INDEX_LUID_TABLE 2 @@ -92,6 +94,24 @@ struct nsi_ndis_ifinfo_static DWORD phys_medium_type; }; +/* Wine specific ioctl interface */ + +#define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) + +/* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ +struct nsiproxy_enumerate_all +{ + NPI_MODULEID module; + DWORD first_arg; + DWORD second_arg; + DWORD table; + DWORD key_size; + DWORD rw_size; + DWORD dynamic_size; + DWORD static_size; + DWORD count; +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.23.0

1 0

[PATCH 3/5] loader: Add tag ids to ensure nsiproxy.sys starts before ndis.sys.
by Huw Davies 29 Jun '21

29 Jun '21

This will be needed as ndis.sys depends on iphlpapi which will in turn depend on nsi. Note that this isn't quite how the tags are supposed to work. The tags should be ordered according to the load group's order list. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- loader/wine.inf.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index defaba008e2..426fe8b1595 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3775,6 +3775,7 @@ ErrorControl=1 LoadOrderGroup="System Bus Extender" [NDISService] +AddReg=NDISServiceKeys Description="NDIS service" DisplayName="NDIS" ServiceBinary="%12%\ndis.sys" @@ -3783,7 +3784,11 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NDISServiceKeys] +HKR,,"Tag",0x10001,2 + [NsiProxyService] +AddReg=NsiProxyServiceKeys Description="NSI proxy service" DisplayName="NSI Proxy" ServiceBinary="%12%\nsiproxy.sys" @@ -3792,6 +3797,9 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NsiProxyServiceKeys] +HKR,,"Tag",0x10001,1 + [RpcSsService] Description="RPC service" DisplayName="Remote Procedure Call (RPC)" -- 2.23.0

1 0

[PATCH 2/5] nsiproxy: Create the nsi device.
by Huw Davies 29 Jun '21

29 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 6 ++ dlls/nsiproxy.sys/device.c | 87 +++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy.sys.spec | 1 + loader/wine.inf.in | 13 +++++ 4 files changed, 107 insertions(+) create mode 100644 dlls/nsiproxy.sys/Makefile.in create mode 100644 dlls/nsiproxy.sys/device.c create mode 100644 dlls/nsiproxy.sys/nsiproxy.sys.spec diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in new file mode 100644 index 00000000000..d1913671f49 --- /dev/null +++ b/dlls/nsiproxy.sys/Makefile.in @@ -0,0 +1,6 @@ +MODULE = nsiproxy.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -Wl,--subsystem,native + +C_SRCS = \ + device.c diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c new file mode 100644 index 00000000000..ecd584bd1cb --- /dev/null +++ b/dlls/nsiproxy.sys/device.c @@ -0,0 +1,87 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + TRACE( "ioctl %x insize %u outsize %u\n", + irpsp->Parameters.DeviceIoControl.IoControlCode, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + { + default: + FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + break; + } + + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static int add_device( DRIVER_OBJECT *driver ) +{ + static const WCHAR name_str[] = {'\\','D','e','v','i','c','e','\\','N','s','i',0}; + static const WCHAR link_str[] = {'\\','?','?','\\','N','s','i',0}; + UNICODE_STRING name, link; + DEVICE_OBJECT *device; + NTSTATUS status; + + RtlInitUnicodeString( &name, name_str ); + RtlInitUnicodeString( &link, link_str ); + + if (!(status = IoCreateDevice( driver, 0, &name, FILE_DEVICE_NETWORK, FILE_DEVICE_SECURE_OPEN, FALSE, &device ))) + status = IoCreateSymbolicLink( &link, &name ); + if (status) + { + FIXME( "failed to create device error %x\n", status ); + return 0; + } + + return 1; +} + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl; + + add_device( driver ); + + return STATUS_SUCCESS; +} diff --git a/dlls/nsiproxy.sys/nsiproxy.sys.spec b/dlls/nsiproxy.sys/nsiproxy.sys.spec new file mode 100644 index 00000000000..590a204a2b0 --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy.sys.spec @@ -0,0 +1 @@ +# no exported functions diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 437c723a5e2..defaba008e2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -165,6 +165,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -184,6 +185,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -203,6 +205,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.ntarm64.Services] AddService=BITS,0,BITSService @@ -222,6 +225,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -3779,6 +3783,15 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NsiProxyService] +Description="NSI proxy service" +DisplayName="NSI Proxy" +ServiceBinary="%12%\nsiproxy.sys" +ServiceType=1 +StartType=2 +ErrorControl=1 +LoadOrderGroup="System Bus Extender" + [RpcSsService] Description="RPC service" DisplayName="Remote Procedure Call (RPC)" -- 2.23.0

1 0

[PATCH 1/5] nsi: Add a stub implementation of NsiGetParameterEx().
by Huw Davies 29 Jun '21

29 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 20 ++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 37 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 16 ++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 4e55721475b..d3292af9ee3 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -115,7 +115,27 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ) { + struct nsi_get_parameter_ex params; + FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, param_type, data, data_size, data_offset ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + params.key_size = key_size; + params.param_type = param_type; + params.data = data; + params.data_size = data_size; + params.data_offset = data_offset; + return NsiGetParameterEx( &params ); +} + +DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 376d25438aa..ba326572fb8 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -13,7 +13,7 @@ @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) -@ stub NsiGetParameterEx +@ stdcall NsiGetParameterEx(ptr) @ stub NsiRegisterChangeNotification @ stub NsiRegisterChangeNotificationEx @ stub NsiRequestChangeNotification diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 7c2c57b9548..51b149e9f65 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -41,6 +41,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; struct nsi_get_all_parameters_ex get_all_params; + struct nsi_get_parameter_ex get_param; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -129,6 +130,42 @@ todo_wine FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); ok( !err, "got %d\n", err ); ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + + memset( &get_param, 0, sizeof(get_param) ); + get_param.first_arg = 1; + get_param.module = &NPI_MS_NDIS_MODULEID; + get_param.table = NSI_NDIS_IFINFO_TABLE; + get_param.key = luid_tbl + i; + get_param.key_size = sizeof(*luid_tbl); + + get_param.param_type = NSI_PARAM_TYPE_RW; + get_param.data = &get_rw.alias; + get_param.data_size = sizeof(get_rw.alias); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + + get_param.param_type = NSI_PARAM_TYPE_STATIC; + get_param.data = &get_stat.if_index; + get_param.data_size = sizeof(get_stat.if_index); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + + get_param.param_type = NSI_PARAM_TYPE_STATIC; + get_param.data = &get_stat.if_guid; + get_param.data_size = sizeof(get_stat.if_guid); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); winetest_pop_context(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 81d221324e9..31ece41d22f 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -133,6 +133,21 @@ struct nsi_get_all_parameters_ex DWORD static_size; }; +struct nsi_get_parameter_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + const void *key; + DWORD key_size; + DWORD_PTR param_type; + void *data; + DWORD data_size; + DWORD data_offset; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -148,5 +163,6 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); +DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ); #endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH v2 1/4] d3dx10/tests: Test texture returned by D3DX10CreateTextureFromMemory on failure.
by Ziqing Hui 29 Jun '21

29 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: This is a new patch in this patch set. dlls/d3dx10_43/tests/d3dx10.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

2 1

Rearchitecting the d3dx DLLs
by Matteo Bruni 29 Jun '21

29 Jun '21

I think we're past the point where we need to figure out what we want to do with the d3dx* DLLs, particularly regarding how to avoid duplication of common functionality between d3dx9, d3dx10 and d3dx11. This is something that's been on my mind for a very long time but it's generally been a topic where people either care strongly or not at all, so I kept pushing back the discussion over and over again. Now I'm finally asking the former category to comment. The latter can stop reading now :P TL;DR: jump to the second-to-last paragraph. Let's start with a quick summary of what those DLLs are. They are basically a loose collection of utility APIs that might often come in handy when writing 3d applications. To give a broad idea, these APIs can be roughly categorized into math, mesh, shader, texture functions. A d3dxn is somewhat related to the corresponding d3dn version: for example d3dx9's D3DXCreateTextureFromFileA() creates a IDirect3DTexture9 object and fills it with data from an on-disk image file. Many other APIs (e.g. the math functions) are abstract enough to be independent from any d3d version. A particularly important detail with these DLLs is what MS decided to do with versioning: each new release of the DirectX SDK (when those were still a thing) usually had a new version of the d3dx DLLs as entirely separate files. There might have been additions or changes compared to a previous version but applications wouldn't see any of that unless they intentionally switched to linking with the new DLL. For example, the last released DirectX SDK (SDK version 43) contains d3dx9_43.dll, d3dx10_43.dll, d3dx11_43.dll, in addition to ALL the DLLs from the previous SDKs (which for d3dx9 means going back up to d3dx9_24.dll). There are interesting side effects of this choice. It allowed MS to make incompatible changes (e.g. see the ID3DXEffect vtbl). It also means that applications can end up depending on quirks specific to a particular d3dxn_xx.dll version. It's also not uncommon to see applications that load and possibly use multiple d3dx DLLs inside the same process. In general, it's lots of fun... Now let's go through the current state of those DLLs in Wine. The d3dx9 DLLs are in a pretty good state as far as API coverage goes (with a few notable exceptions, e.g. shader compiler). The implementation is in d3dx9_36/ and all the other _xx variants use the PARENTSRC mechanism to build entirely separate DLLs, mimicking native. Originally we forwarded everything to d3dx9_36 but that broke some applications, particularly from the demo scene. d3dx10 still forwards most of the math functions to d3dx9_36. The rest is largely unimplemented. d3dx11 is all but unimplemented. Fortunately, MS dropped most of the APIs along the way, especially when moving from d3dx10 to d3dx11. Unfortunately, that doesn't help a ton. For example, there is enough stuff in the texture API alone that could (and should) be shared and the API itself is different enough that it can't be done by simply forwarding some public function from d3dxn to d3dx(n-1) or such. Having >= 3 similar but separate implementations of image filtering over various d3dx DLLs that all do the same thing seems not that attractive. And then let's not forget the other "axis" i.e. the _xx suffixed versioning which can make things extra convoluted. If you're still here, congratulations! Now for the proposal i.e. how to move forward. There are a few options I can think of: 1 - Allow to have multiple paths in PARENTSRC, rework the d3dx9 code to make it possible to reuse helpers in d3dx10 and d3dx11 2 - Introduce a new PE DLL where the shared code would reside, keep the PARENTSRC mechanism to handle the _xx versioning 3 - Introduce a new unix lib for the shared code, keep the PARENTSRC mechanism for the _xx versioning part 4 - Just duplicate everything, durr Reasons to favor one option over the rest? Other ideas I have missed? Personally I prefer option 2. The only downside that I see is that it would introduce a Wine-specific DLL, which is something that we normally want to avoid. There are many advantages though: compared to 1 (and the status quo) we'd reduce Wine compilation time and the overall size of the d3dx DLLs; we'd also avoid loading extra d3dx* DLLs as required by the forwards. In respect to option 3, we wouldn't introduce unnecessary (sys)call overhead, which we really don't want to have for stuff like D3DXVec4Transform(). Looking forward to any type of comment.

4 6

[PATCH v2 4/4] d3dx10: Support block compressed format for D3DX10CreateTextureFromMemory.
by Ziqing Hui 29 Jun '21

29 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +- dlls/d3dx10_43/texture.c | 87 ++++++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 22 deletions(-)

1 0

[PATCH v2 3/4] d3dx10: Handle format converting for D3DX10CreateTextureFromMemory.
by Ziqing Hui 29 Jun '21

29 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/d3dx10_43/texture.c | 83 ++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 8 deletions(-)

1 0

[PATCH v2 2/4] d3dx10: Implement D3DX10CreateTextureFromMemory initially.
by Ziqing Hui 29 Jun '21

29 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Put function call into make. * Check return value of WICCreateImagingFactory_Proxy. * Get rid of UpdateSubresource(). * Use "return hr" dlls/d3dx10_43/d3dx10_43_main.c | 11 -- dlls/d3dx10_43/tests/d3dx10.c | 7 +- dlls/d3dx10_43/texture.c | 229 ++++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 15 deletions(-)

1 0

[PATCH v3 1/2] quartz/tests: Test IGraphBuilder::RenderFile cleanup on failure
by Tim Clem 28 Jun '21

28 Jun '21

Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fdcfcead0be..f0d7d7c275e 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4186,6 +4186,45 @@ static void test_ec_complete(void) ok(filter3.ref == 1, "Got outstanding refcount %d.\n", filter3.ref); } +static void test_renderfile_failure(void) +{ + static const char bogus_data[20] = {0xde, 0xad, 0xbe, 0xef}; + + struct testfilter testfilter; + IFilterGraph2 *graph; + IEnumFilters *filterenum; + IBaseFilter *filter; + HRESULT hr; + const WCHAR *filename; + + /* Windows removes the source filter from the graph if a RenderFile + * call fails. It leaves the rest of the graph intact. */ + + graph = create_graph(); + testfilter_init(&testfilter, NULL, 0); + hr = IFilterGraph2_AddFilter(graph, &testfilter.IBaseFilter_iface, L"dummy"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filename = create_file(L"test.nonsense", bogus_data, sizeof(bogus_data)); + hr = IFilterGraph2_RenderFile(graph, filename, NULL); + todo_wine ok(hr == VFW_E_UNSUPPORTED_STREAM, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_EnumFilters(graph, &filterenum); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Next(filterenum, 1, &filter, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(filter == &testfilter.IBaseFilter_iface, "Got unexpected filter %p.\n", filter); + + hr = IEnumFilters_Next(filterenum, 1, &filter, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumFilters_Release(filterenum); + + IFilterGraph2_Release(graph); + todo_wine ok(DeleteFileW(filename), "Failed to delete temporary file.\n"); +} + /* Remove and re-add the filter, to flush the graph's internal * IMediaSeeking cache. Don't expose IMediaSeeking when adding, to show * that it's only queried when needed. */ @@ -5645,6 +5684,7 @@ START_TEST(filtergraph) test_sync_source(); test_filter_state(); test_ec_complete(); + test_renderfile_failure(); test_graph_seeking(); test_default_sync_source(); test_add_source_filter(); -- 2.32.0

2 3

[PATCH v2 1/2] quartz/tests: Test IGraphBuilder::RenderFile cleanup on failure
by Tim Clem 28 Jun '21

28 Jun '21

Simplified the test and added a check on the return of DeleteFile. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 44 +++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fdcfcead0be..fbe51d29efc 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4186,6 +4186,49 @@ static void test_ec_complete(void) ok(filter3.ref == 1, "Got outstanding refcount %d.\n", filter3.ref); } +static void test_renderfile_failure(void) +{ + static const char bogus_data[20] = {0xde, 0xad, 0xbe, 0xef}; + + struct testfilter testfilter; + IFilterGraph2 *graph; + IEnumFilters *filterenum; + IBaseFilter *filter; + HRESULT hr; + const WCHAR *filename; + + /* Windows removes the source filter from the graph if a RenderFile + * call fails. It leaves the rest of the graph intact. */ + + graph = create_graph(); + testfilter_init(&testfilter, NULL, 0); + hr = IFilterGraph2_AddFilter(graph, &testfilter.IBaseFilter_iface, L"dummy"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filename = create_file(L"test.nonsense", bogus_data, sizeof(bogus_data)); + hr = IFilterGraph2_RenderFile(graph, filename, NULL); + if (SUCCEEDED(hr)) { + skip("Expected RenderFile to fail on invalid file.\n"); + goto out; + } + + hr = IFilterGraph2_EnumFilters(graph, &filterenum); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Next(filterenum, 1, &filter, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(filter == &testfilter.IBaseFilter_iface, "Got unexpected filter %p.\n", filter); + + hr = IEnumFilters_Next(filterenum, 1, &filter, NULL); + todo_wine ok(hr == S_FALSE, "Expected only one filter in the graph.\n"); + + IEnumFilters_Release(filterenum); + +out: + IFilterGraph2_Release(graph); + todo_wine ok(DeleteFileW(filename), "Failed to delete temporary file.\n"); +} + /* Remove and re-add the filter, to flush the graph's internal * IMediaSeeking cache. Don't expose IMediaSeeking when adding, to show * that it's only queried when needed. */ @@ -5645,6 +5688,7 @@ START_TEST(filtergraph) test_sync_source(); test_filter_state(); test_ec_complete(); + test_renderfile_failure(); test_graph_seeking(); test_default_sync_source(); test_add_source_filter(); -- 2.32.0

2 3

[PATCH 1/2] quartz/tests: Test IGraphBuilder::RenderFile cleanup on failure
by Tim Clem 28 Jun '21

28 Jun '21

Testing on Windows confirmed that IGraphBuilder::RenderFile removes the source filter it adds if the file cannot be played. This was resulting in leaked file handles and threads if a program tried to play media without a proper set of filters installed. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 54 +++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fdcfcead0be..a509a07872c 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4186,6 +4186,59 @@ static void test_ec_complete(void) ok(filter3.ref == 1, "Got outstanding refcount %d.\n", filter3.ref); } +static void test_renderfile_failure(void) +{ + static const char bogus_data[20] = {0xde, 0xad, 0xbe, 0xef}; + + struct testfilter testfilter; + IFilterGraph2 *graph; + IEnumFilters *filterenum; + IBaseFilter *filter; + HRESULT hr; + BOOL saw_testfilter = FALSE; + FILTER_INFO filter_info; + const WCHAR *filename; + + /* Windows removes the source filter from the graph if a RenderFile + * call fails. It leaves the rest of the graph intact. */ + + graph = create_graph(); + testfilter_init(&testfilter, NULL, 0); + hr = IFilterGraph2_AddFilter(graph, &testfilter.IBaseFilter_iface, L"dummy"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filename = create_file(L"test.nonsense", bogus_data, sizeof(bogus_data)); + hr = IFilterGraph2_RenderFile(graph, filename, NULL); + if (SUCCEEDED(hr)) { + skip("Expected RenderFile to fail on invalid file.\n"); + goto out; + } + + hr = IFilterGraph2_EnumFilters(graph, &filterenum); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumFilters_Next(filterenum, 1, &filter, NULL) == S_OK) + { + if (!saw_testfilter && filter == &testfilter.IBaseFilter_iface) + saw_testfilter = TRUE; + else { + hr = IBaseFilter_QueryFilterInfo(filter, &filter_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(0, "Unexpected filter %p (%s) left in graph.\n", + filter, wine_dbgstr_w(filter_info.achName)); + } + + IBaseFilter_Release(filter); + } + IEnumFilters_Release(filterenum); + + ok(saw_testfilter, "Expected testfilter to remain in graph.\n"); + +out: + IFilterGraph2_Release(graph); + DeleteFileW(filename); +} + /* Remove and re-add the filter, to flush the graph's internal * IMediaSeeking cache. Don't expose IMediaSeeking when adding, to show * that it's only queried when needed. */ @@ -5645,6 +5698,7 @@ START_TEST(filtergraph) test_sync_source(); test_filter_state(); test_ec_complete(); + test_renderfile_failure(); test_graph_seeking(); test_default_sync_source(); test_add_source_filter(); -- 2.32.0

3 7

[PATCH] mshtml: Handle NULL nsstyle in HTMLWindow7_getComputedStyle().
by Paul Gofman 28 Jun '21

28 Jun '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Mozilla can sometimes return NULL nsstyle while nsIDOMWindow_GetComputedStyle() returns S_OK. dlls/mshtml/htmlwindow.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4c57d457e41..0ca4cd6397e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2364,6 +2364,13 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM return E_FAIL; } + if (!nsstyle) + { + FIXME("nsIDOMWindow_GetComputedStyle returned NULL nsstyle.\n"); + *p = NULL; + return S_OK; + } + hres = create_computed_style(nsstyle, dispex_compat_mode(&This->inner_window->event_target.dispex), p); nsIDOMCSSStyleDeclaration_Release(nsstyle); return hres; -- 2.31.1

2 1

[PATCH 1/5] server: Introduce IOCTL_AFD_WINE_SET_SO_RCVBUF.
by Zebediah Figura 28 Jun '21

28 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 1 + server/sock.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index ae5a0584bdc..99df0b8d65e 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -169,6 +169,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index e7754dc0da3..aaac693d098 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2580,6 +2580,22 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_SET_SO_RCVBUF: + { + DWORD rcvbuf; + + if (get_req_data_size() < sizeof(rcvbuf)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + rcvbuf = *(DWORD *)get_req_data(); + + if (setsockopt( unix_fd, SOL_SOCKET, SO_RCVBUF, (char *)&rcvbuf, sizeof(rcvbuf) ) < 0) + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; -- 2.30.2

3 6

[PATCH 1/5] ntoskrnl.exe/tests: Retry timer wait to address spurious failures.
by Rémi Bernon 28 Jun '21

28 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f1c72d8fdaf..918b4632c40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -756,6 +756,8 @@ static void test_sync(void) ok(ret == 0, "got %#x\n", ret); ret = wait_single(&timer, 0); + /* aliasing makes it sometimes succeeds, try again in that case */ + if (ret == 0) ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); ret = wait_single(&timer, -40 * 10000); -- 2.32.0

2 7

[PATCH vkd3d 1/5] vkd3d-shader: Allow declarations to specify type modifiers redundant with the type.
by Zebediah Figura 28 Jun '21

28 Jun '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 6 +++++- tests/hlsl-duplicate-modifiers.shader_test | 11 +++++++++++ tests/hlsl-invalid.shader_test | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 tests/hlsl-duplicate-modifiers.shader_test diff --git a/Makefile.am b/Makefile.am index e8537864..5b3c4ff0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -256,6 +257,7 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 828b19a4..513c4512 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -659,9 +659,13 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ if (!(new_type = hlsl_type_clone(ctx, type, default_majority))) return NULL; - new_type->modifiers = add_modifiers(ctx, new_type->modifiers, *modifiers, loc); + new_type->modifiers |= *modifiers; *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; + if ((new_type->modifiers & HLSL_MODIFIER_ROW_MAJOR) && (new_type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR)) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "'row_major' and 'column_major' modifiers are mutually exclusive."); + if (new_type->type == HLSL_CLASS_MATRIX) new_type->reg_size = (hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx) * 4; return new_type; diff --git a/tests/hlsl-duplicate-modifiers.shader_test b/tests/hlsl-duplicate-modifiers.shader_test new file mode 100644 index 00000000..6491701a --- /dev/null +++ b/tests/hlsl-duplicate-modifiers.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +typedef const precise row_major float2x2 mat_t; +float4 main() : sv_target +{ + const precise row_major mat_t mat = float2x2(0.1, 0.2, 0.3, 0.4); + return mat; +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 72055989..f6a7ffd3 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -219,3 +219,20 @@ float4 main(void) : sv_target in float f; return 0; } + +[pixel shader fail] +const const float4 c; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +typedef row_major float4x4 mat_t; +column_major mat_t m; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} -- 2.32.0

5 16

[PATCH] conhost: Silence FIXME in console_input_ioctl.
by Jacek Caban 28 Jun '21

28 Jun '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] wined3d: Pass a wined3d_resource and sub-resource index to wined3d_texture_check_box_dimensions().
by Zebediah Figura 28 Jun '21

28 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 9 ++---- dlls/wined3d/resource.c | 38 ++++++++++++++++++++++++++ dlls/wined3d/texture.c | 50 +++------------------------------- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 47 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2af705b10e3..5b2bd7ae03b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4608,7 +4608,7 @@ HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_dev wined3d_box_set(&b, 0, 0, min(src_w, dst_w), min(src_h, dst_h), 0, min(src_d, dst_d)); src_box = &b; } - else if (FAILED(wined3d_texture_check_box_dimensions(src_texture, src_level, src_box))) + else if (FAILED(wined3d_resource_check_box_dimensions(src_resource, src_sub_resource_idx, src_box))) { WARN("Invalid source box %s.\n", debug_box(src_box)); return WINED3DERR_INVALIDCALL; @@ -4631,8 +4631,7 @@ HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_dev dst_y + (src_row_count * dst_resource->format->block_height), dst_z, dst_z + (src_box->back - src_box->front)); } - if (FAILED(wined3d_texture_check_box_dimensions(dst_texture, - dst_sub_resource_idx % dst_texture->level_count, &dst_box))) + if (FAILED(wined3d_resource_check_box_dimensions(dst_resource, dst_sub_resource_idx, &dst_box))) { WARN("Invalid destination box %s.\n", debug_box(&dst_box)); return WINED3DERR_INVALIDCALL; @@ -4760,11 +4759,9 @@ HRESULT CDECL wined3d_device_context_clear_rendertarget_view(struct wined3d_devi else { struct wined3d_box b = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - struct wined3d_texture *texture = texture_from_resource(view->resource); HRESULT hr; - if (FAILED(hr = wined3d_texture_check_box_dimensions(texture, - view->sub_resource_idx % texture->level_count, &b))) + if (FAILED(hr = wined3d_resource_check_box_dimensions(resource, view->sub_resource_idx, &b))) return hr; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 58e3e5c77fd..f37c313e023 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -501,6 +501,44 @@ unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *re return resource->multisample_type; } +HRESULT wined3d_resource_check_box_dimensions(struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box) +{ + const struct wined3d_format *format = resource->format; + struct wined3d_sub_resource_desc desc; + unsigned int width_mask, height_mask; + + wined3d_resource_get_sub_resource_desc(resource, sub_resource_idx, &desc); + + if (box->left >= box->right || box->right > desc.width + || box->top >= box->bottom || box->bottom > desc.height + || box->front >= box->back || box->back > desc.depth) + { + WARN("Box %s is invalid.\n", debug_box(box)); + return WINEDDERR_INVALIDRECT; + } + + if (resource->format_flags & WINED3DFMT_FLAG_BLOCKS) + { + /* This assumes power of two block sizes, but NPOT block sizes would + * be silly anyway. + * + * This also assumes that the format's block depth is 1. */ + width_mask = format->block_width - 1; + height_mask = format->block_height - 1; + + if ((box->left & width_mask) || (box->top & height_mask) + || (box->right & width_mask && box->right != desc.width) + || (box->bottom & height_mask && box->bottom != desc.height)) + { + WARN("Box %s is misaligned for %ux%u blocks.\n", debug_box(box), format->block_width, format->block_height); + return WINED3DERR_INVALIDCALL; + } + } + + return WINED3D_OK; +} + VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) { VkAccessFlags flags = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5876f580e0d..0f753e66704 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1653,46 +1653,6 @@ void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) return texture->resource.parent; } -HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, - unsigned int level, const struct wined3d_box *box) -{ - const struct wined3d_format *format = texture->resource.format; - unsigned int width_mask, height_mask, width, height, depth; - - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - - if (box->left >= box->right || box->right > width - || box->top >= box->bottom || box->bottom > height - || box->front >= box->back || box->back > depth) - { - WARN("Box %s is invalid.\n", debug_box(box)); - return WINEDDERR_INVALIDRECT; - } - - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - { - /* This assumes power of two block sizes, but NPOT block sizes would - * be silly anyway. - * - * This also assumes that the format's block depth is 1. */ - width_mask = format->block_width - 1; - height_mask = format->block_height - 1; - - if ((box->left & width_mask) || (box->top & height_mask) - || (box->right & width_mask && box->right != width) - || (box->bottom & height_mask && box->bottom != height)) - { - WARN("Box %s is misaligned for %ux%u blocks.\n", - debug_box(box), format->block_width, format->block_height); - return WINED3DERR_INVALIDCALL; - } - } - - return WINED3D_OK; -} - void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) { @@ -2250,7 +2210,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3DERR_INVALIDCALL; } - if (dirty_region && FAILED(wined3d_texture_check_box_dimensions(texture, 0, dirty_region))) + if (dirty_region && FAILED(wined3d_resource_check_box_dimensions(&texture->resource, 0, dirty_region))) { WARN("Invalid dirty_region %s specified.\n", debug_box(dirty_region)); return WINED3DERR_INVALIDCALL; @@ -3553,7 +3513,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); texture_level = sub_resource_idx % texture->level_count; - if (FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) + if (FAILED(wined3d_resource_check_box_dimensions(resource, sub_resource_idx, box))) { WARN("Map box is invalid.\n"); if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) @@ -4024,12 +3984,10 @@ HRESULT CDECL wined3d_device_context_blt(struct wined3d_device_context *context, && filter != WINED3D_TEXF_LINEAR) return WINED3DERR_INVALIDCALL; - if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, - dst_sub_resource_idx % dst_texture->level_count, &dst_box))) + if (FAILED(hr = wined3d_resource_check_box_dimensions(&dst_texture->resource, dst_sub_resource_idx, &dst_box))) return hr; - if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, - src_sub_resource_idx % src_texture->level_count, &src_box))) + if (FAILED(hr = wined3d_resource_check_box_dimensions(&src_texture->resource, src_sub_resource_idx, &src_box))) return hr; if (dst_texture->sub_resources[dst_sub_resource_idx].map_count diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84dad38f0c9..6700302b481 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4134,6 +4134,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +HRESULT wined3d_resource_check_box_dimensions(struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; const struct wined3d_format *wined3d_resource_get_decompress_format( const struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4358,8 +4360,6 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned i void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD src_location, DWORD dst_location) DECLSPEC_HIDDEN; -HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, - unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_cleanup(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; -- 2.30.2

4 9

[PATCH 1/5] d2d1: Use D3D11 interfaces to create rasterizer state.
by Rémi Bernon 28 Jun '21

28 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 73259835786..0915bc55cfd 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -172,7 +172,7 @@ struct d2d_device_context ID3D11Buffer *ib; unsigned int vb_stride; ID3D11Buffer *vb; - ID3D10RasterizerState *rs; + ID3D11RasterizerState *rs; ID3D10BlendState *bs; ID3D10SamplerState *sampler_states [D2D_SAMPLER_INTERPOLATION_MODE_COUNT] diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index efeeaf6aa18..0a0e9f5bbe6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -125,6 +125,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device *device = render_target->d3d_device; ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; + ID3D10RasterizerState *d3d10_rs = NULL; ID3D10VertexShader *d3d10_vs = NULL; ID3D10PixelShader *d3d10_ps = NULL; ID3D10InputLayout *d3d10_il = NULL; @@ -182,6 +183,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (render_target->rs && FAILED(hr = ID3D11RasterizerState_QueryInterface(render_target->rs, &IID_ID3D10RasterizerState, (void **)&d3d10_rs))) + { + ERR("Failed to query D3D10 rasterizer state, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -218,7 +225,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en scissor_rect.bottom = render_target->pixel_size.height; } ID3D10Device_RSSetScissorRects(device, 1, &scissor_rect); - ID3D10Device_RSSetState(device, render_target->rs); + ID3D10Device_RSSetState(device, d3d10_rs); ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); if (brush) { @@ -237,6 +244,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_rs) ID3D10RasterizerState_Release(d3d10_rs); if (d3d10_ps) ID3D10PixelShader_Release(d3d10_ps); if (d3d10_vs) ID3D10VertexShader_Release(d3d10_vs); if (d3d10_il) ID3D10InputLayout_Release(d3d10_il); @@ -318,7 +326,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) IDWriteRenderingParams_Release(context->text_rendering_params); if (context->bs) ID3D10BlendState_Release(context->bs); - ID3D10RasterizerState_Release(context->rs); + ID3D11RasterizerState_Release(context->rs); ID3D11Buffer_Release(context->vb); ID3D11Buffer_Release(context->ib); ID3D11Buffer_Release(context->ps_cb); @@ -2859,7 +2867,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, D3D10_STATE_BLOCK_MASK state_mask; struct d2d_device *device_impl; IDWriteFactory *dwrite_factory; - D3D10_RASTERIZER_DESC rs_desc; + D3D11_RASTERIZER_DESC rs_desc; D3D11_BUFFER_DESC buffer_desc; unsigned int i; HRESULT hr; @@ -4033,8 +4041,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, goto err; } - rs_desc.FillMode = D3D10_FILL_SOLID; - rs_desc.CullMode = D3D10_CULL_NONE; + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_NONE; rs_desc.FrontCounterClockwise = FALSE; rs_desc.DepthBias = 0; rs_desc.DepthBiasClamp = 0.0f; @@ -4043,7 +4051,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, rs_desc.ScissorEnable = TRUE; rs_desc.MultisampleEnable = FALSE; rs_desc.AntialiasedLineEnable = FALSE; - if (FAILED(hr = ID3D10Device_CreateRasterizerState(render_target->d3d_device, &rs_desc, &render_target->rs))) + if (FAILED(hr = ID3D11Device1_CreateRasterizerState(render_target->d3d11_device, &rs_desc, &render_target->rs))) { WARN("Failed to create clear rasterizer state, hr %#x.\n", hr); goto err; @@ -4082,7 +4090,7 @@ err: if (render_target->default_text_rendering_params) IDWriteRenderingParams_Release(render_target->default_text_rendering_params); if (render_target->rs) - ID3D10RasterizerState_Release(render_target->rs); + ID3D11RasterizerState_Release(render_target->rs); if (render_target->vb) ID3D11Buffer_Release(render_target->vb); if (render_target->ib) -- 2.32.0

4 11

[PATCH] wined3d: Avoid ending the renderpass when issuing a query.
by Jan Sikorski 28 Jun '21

28 Jun '21

Allocate a fresh query index that does not need to be reset. Reset query pools at creation and when the render pass is ended. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 19 +++++++++++--- dlls/wined3d/query.c | 47 ++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 6 ++++- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 43b806a19b5..8b20fd3f779 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1282,12 +1282,11 @@ VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *conte void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *context_vk) { + VkCommandBuffer vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; const struct wined3d_vk_info *vk_info = context_vk->vk_info; - VkCommandBuffer vk_command_buffer; if (context_vk->vk_render_pass) { - vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; VK_CALL(vkCmdEndRenderPass(vk_command_buffer)); context_vk->vk_render_pass = VK_NULL_HANDLE; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, @@ -1300,6 +1299,15 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte context_vk->vk_framebuffer, context_vk->current_command_buffer.id); context_vk->vk_framebuffer = VK_NULL_HANDLE; } + + while (!list_empty(&context_vk->dirty_query_pools)) + { + struct wined3d_query_pool_vk *pool_vk = LIST_ENTRY(list_head(&context_vk->dirty_query_pools), + struct wined3d_query_pool_vk, dirty_entry); + list_remove(&pool_vk->dirty_entry); + list_init(&pool_vk->dirty_entry); + wined3d_query_pool_vk_reset(pool_vk, context_vk, vk_command_buffer); + } } static void wined3d_context_vk_destroy_render_pass(struct wine_rb_entry *entry, void *ctx) @@ -1330,6 +1338,7 @@ static void wined3d_context_vk_destroy_query_pools(struct wined3d_context_vk *co bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct wined3d_query_pool_idx_vk *pool_idx) { + const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_query_pool_vk *pool_vk, *entry; struct list *free_pools; size_t idx; @@ -1376,6 +1385,10 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, return false; } + wined3d_context_vk_end_current_render_pass(context_vk); + VK_CALL(vkCmdResetQueryPool(wined3d_context_vk_get_command_buffer(context_vk), + pool_vk->vk_query_pool, 0, WINED3D_QUERY_POOL_SIZE)); + if (!wined3d_query_pool_vk_allocate_query(pool_vk, &idx)) { wined3d_query_pool_vk_cleanup(pool_vk, context_vk); @@ -1449,7 +1462,6 @@ void wined3d_context_vk_remove_pending_queries(struct wined3d_context_vk *contex { if (p->query_vk != query_vk && !wined3d_query_vk_accumulate_data(p->query_vk, context_vk, &p->pool_idx)) continue; - wined3d_query_pool_vk_free_query(p->pool_idx.pool_vk, p->pool_idx.idx); --p->query_vk->pending_count; } @@ -3390,6 +3402,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi wined3d_context_vk_init_graphics_pipeline_key(context_vk); list_init(&context_vk->active_queries); + list_init(&context_vk->dirty_query_pools); list_init(&context_vk->free_occlusion_query_pools); list_init(&context_vk->free_timestamp_query_pools); list_init(&context_vk->free_pipeline_statistics_query_pools); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 81f5ba7d0d7..8c135f09c0a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1348,12 +1348,12 @@ HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_quer } } -void wined3d_query_pool_vk_free_query(struct wined3d_query_pool_vk *pool_vk, size_t idx) +static void wined3d_query_pool_vk_mark_complete(struct wined3d_query_pool_vk *pool_vk, size_t idx, + struct wined3d_context_vk *context_vk) { - wined3d_bitmap_clear(pool_vk->allocated, idx); - - if (list_empty(&pool_vk->entry)) - list_add_tail(pool_vk->free_list, &pool_vk->entry); + wined3d_bitmap_set(pool_vk->completed, idx); + if (list_empty(&pool_vk->dirty_entry)) + list_add_tail(&context_vk->dirty_query_pools, &pool_vk->dirty_entry); } bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) @@ -1372,6 +1372,29 @@ void wined3d_query_pool_vk_cleanup(struct wined3d_query_pool_vk *pool_vk, struct VK_CALL(vkDestroyQueryPool(device_vk->vk_device, pool_vk->vk_query_pool, NULL)); list_remove(&pool_vk->entry); + list_remove(&pool_vk->dirty_entry); +} + +void wined3d_query_pool_vk_reset(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer) +{ + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + unsigned int start = 0, idx; + struct wined3d_range range; + + for (;;) + { + if (!wined3d_bitmap_get_range(pool_vk->completed, WINED3D_QUERY_POOL_SIZE, start, &range)) + break; + + VK_CALL(vkCmdResetQueryPool(vk_command_buffer, pool_vk->vk_query_pool, range.offset, range.size)); + start = range.offset + range.size; + for (idx = range.offset; idx < start; ++idx) + wined3d_bitmap_clear(pool_vk->allocated, idx); + } + memset(pool_vk->completed, 0, sizeof(pool_vk->completed)); + if (list_empty(&pool_vk->entry)) + list_add_tail(pool_vk->free_list, &pool_vk->entry); } bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, @@ -1383,6 +1406,7 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, VkResult vr; list_init(&pool_vk->entry); + list_init(&pool_vk->dirty_entry); pool_vk->free_list = free_pools; pool_info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO; @@ -1468,6 +1492,8 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, if (vr == VK_NOT_READY) return false; + wined3d_query_pool_vk_mark_complete(pool_idx->pool_vk, pool_idx->idx, context_vk); + result = (void *)query_vk->q.data; switch (query_vk->q.type) { @@ -1519,8 +1545,7 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, struct wined3d_query_pool_vk *pool_vk; size_t idx; - if (!query_vk->pool_idx.pool_vk - && !wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) { ERR("Failed to allocate new query.\n"); return; @@ -1528,7 +1553,6 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, pool_vk = query_vk->pool_idx.pool_vk; idx = query_vk->pool_idx.idx; - VK_CALL(vkCmdResetQueryPool(vk_command_buffer, pool_vk->vk_query_pool, idx, 1)); if (query_vk->q.type >= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 && query_vk->q.type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) VK_CALL(vkCmdBeginQueryIndexedEXT(vk_command_buffer, pool_vk->vk_query_pool, idx, @@ -1599,6 +1623,7 @@ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) if (query_vk->pool_idx.pool_vk && !wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pool_idx)) goto unavailable; + query_vk->pool_idx.pool_vk = NULL; context_release(&context_vk->c); return TRUE; @@ -1622,7 +1647,6 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - wined3d_context_vk_end_current_render_pass(context_vk); list_remove(&query_vk->entry); if (query_vk->pending_count) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); @@ -1633,6 +1657,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); list_remove(&query_vk->entry); } + if (query_vk->pool_idx.pool_vk) + wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, + query_vk->pool_idx.idx, context_vk); wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); list_add_head(&context_vk->active_queries, &query_vk->entry); query_vk->started = true; @@ -1669,8 +1696,6 @@ static void wined3d_query_vk_destroy(struct wined3d_query *query) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); context_release(&context_vk->c); } - if (query_vk->pool_idx.pool_vk) - wined3d_query_pool_vk_free_query(query_vk->pool_idx.pool_vk, query_vk->pool_idx.idx); heap_free(query_vk); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84dad38f0c9..70691df7246 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2023,16 +2023,19 @@ struct wined3d_pipeline_statistics_query struct wined3d_query_pool_vk { struct list entry; + struct list dirty_entry; struct list *free_list; VkQueryPool vk_query_pool; uint32_t allocated[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; + uint32_t completed[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; }; bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) DECLSPEC_HIDDEN; void wined3d_query_pool_vk_cleanup(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -void wined3d_query_pool_vk_free_query(struct wined3d_query_pool_vk *pool_vk, size_t idx) DECLSPEC_HIDDEN; +void wined3d_query_pool_vk_reset(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer) DECLSPEC_HIDDEN; bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct list *free_pools) DECLSPEC_HIDDEN; @@ -2574,6 +2577,7 @@ struct wined3d_context_vk struct list active_queries; struct wined3d_pending_queries_vk pending_queries; + struct list dirty_query_pools; struct list free_occlusion_query_pools; struct list free_timestamp_query_pools; struct list free_pipeline_statistics_query_pools; -- 2.30.2

2 1

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