- Wine-Devel - list.winehq.org

[PATCH v2 1/5] wined3d: Pass a wined3d_device_context to wined3d_shader_resource_view_generate_mipmaps().
by Zebediah Figura April 9, 2021

April 9, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Move to device.c while we're at it. dlls/d3d11/device.c | 6 ++++-- dlls/d3d9/texture.c | 2 +- dlls/wined3d/device.c | 23 +++++++++++++++++++++++ dlls/wined3d/view.c | 22 ---------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d94babcbb24..ab5ad625bdf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1359,12 +1359,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_GenerateMips(ID3D11DeviceContext1 *iface, ID3D11ShaderResourceView *view) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D11ShaderResourceView(view); TRACE("iface %p, view %p.\n", iface, view); wined3d_mutex_lock(); - wined3d_shader_resource_view_generate_mipmaps(srv->wined3d_view); + wined3d_device_context_generate_mipmaps(context->wined3d_context, srv->wined3d_view); wined3d_mutex_unlock(); } @@ -4965,12 +4966,13 @@ static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 * static void STDMETHODCALLTYPE d3d10_device_GenerateMips(ID3D10Device1 *iface, ID3D10ShaderResourceView *view) { + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D10ShaderResourceView(view); TRACE("iface %p, view %p.\n", iface, view); wined3d_mutex_lock(); - wined3d_shader_resource_view_generate_mipmaps(srv->wined3d_view); + wined3d_device_context_generate_mipmaps(device->immediate_context.wined3d_context, srv->wined3d_view); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 989e6fd81c1..19f0363db07 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -100,7 +100,7 @@ void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture) if (!(texture->flags & D3D9_TEXTURE_MIPMAP_DIRTY)) return; d3d9_texture_acquire_shader_resource_view(texture); - wined3d_shader_resource_view_generate_mipmaps(texture->wined3d_srv); + wined3d_device_context_generate_mipmaps(texture->parent_device->immediate_context, texture->wined3d_srv); texture->flags &= ~D3D9_TEXTURE_MIPMAP_DIRTY; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c7b743e0ff3..7051f3749a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5291,6 +5291,29 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic return wined3d_device_context_set_depth_stencil_view(&device->cs->c, view); } +void CDECL wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, + struct wined3d_shader_resource_view *view) +{ + struct wined3d_texture *texture; + + TRACE("context %p, view %p.\n", context, view); + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + { + WARN("Called on buffer resource %p.\n", view->resource); + return; + } + + texture = texture_from_resource(view->resource); + if (!(texture->flags & WINED3D_TEXTURE_GENERATE_MIPMAPS)) + { + WARN("Texture without the WINED3D_TEXTURE_GENERATE_MIPMAPS flag, ignoring.\n"); + return; + } + + wined3d_device_context_emit_generate_mipmaps(context, view); +} + static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, struct wined3d_texture *cursor_image, unsigned int sub_resource_idx) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d386ebe1866..03abaf57102 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1404,28 +1404,6 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou wined3d_context_vk_reference_texture(context_vk, texture_vk); } -void CDECL wined3d_shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view *view) -{ - struct wined3d_texture *texture; - - TRACE("view %p.\n", view); - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - { - WARN("Called on buffer resource %p.\n", view->resource); - return; - } - - texture = texture_from_resource(view->resource); - if (!(texture->flags & WINED3D_TEXTURE_GENERATE_MIPMAPS)) - { - WARN("Texture without the WINED3D_TEXTURE_GENERATE_MIPMAPS flag, ignoring.\n"); - return; - } - - wined3d_device_context_emit_generate_mipmaps(&view->resource->device->cs->c, view); -} - ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a18969a7e9a..3df1f19b837 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) +@ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @@ -260,7 +261,6 @@ @ cdecl wined3d_shader_resource_view_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_resource_view_decref(ptr) -@ cdecl wined3d_shader_resource_view_generate_mipmaps(ptr) @ cdecl wined3d_shader_resource_view_get_parent(ptr) @ cdecl wined3d_shader_resource_view_incref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 36e6e5aae00..35bcb45f851 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2567,6 +2567,8 @@ void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context * unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context *context, struct wined3d_buffer *buffer, unsigned int offset, bool indexed); +void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, + struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, enum wined3d_format_id format_id); @@ -2789,7 +2791,6 @@ HRESULT __cdecl wined3d_shader_resource_view_create(const struct wined3d_view_de struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view); ULONG __cdecl wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view); -void __cdecl wined3d_shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view *view); void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view); ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view); -- 2.30.2

3 10

[PATCH] dxgi/tests: Remove superfluous casts to self
by Michael Stefaniuc April 9, 2021

April 9, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2d8826fde8e..879fea94411 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2886,8 +2886,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 swapchain_desc.BufferDesc.Height = 480; swapchain_desc.OutputWindow = create_window(); swapchain_desc.Windowed = TRUE; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, - &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx, output_idx, hr); @@ -2988,8 +2987,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, - &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); if (FAILED(hr)) { skip("Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx, @@ -6620,8 +6618,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) swapchain_desc.BufferDesc.Scaling = modes[mode_idx].Scaling; swapchain_desc.OutputWindow = create_window(); heap_free(modes); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, - &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx, output_idx, hr); -- 2.26.3

2 1

[PATCH] wined3d: Use the client area dimensions instead of the backbuffer dimensions for the Vulkan swapchain.
by Henri Verbeet April 9, 2021

April 9, 2021

Often these are the same, and even when not, the minimum/maximum image extents will often end up forcing the swapchain dimensions to be the same as the client area. However, some implementations will allow the swapchain to be created with dimensions different from the client area, but then return VK_SUBOPTIMAL_KHR from vkQueuePresentKHR(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 92df08461d9..10e12a11482 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -884,6 +884,7 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc VkSurfaceKHR vk_surface; VkBool32 supported; VkFormat vk_format; + RECT client_rect; VkResult vr; adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); @@ -931,21 +932,23 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc WARN("Image count %u is not supported (%u-%u).\n", desc->backbuffer_count, surface_caps.minImageCount, surface_caps.maxImageCount); - width = desc->backbuffer_width; + GetClientRect(swapchain_vk->s.win_handle, &client_rect); + + width = client_rect.right - client_rect.left; if (width < surface_caps.minImageExtent.width) width = surface_caps.minImageExtent.width; else if (width > surface_caps.maxImageExtent.width) width = surface_caps.maxImageExtent.width; - height = desc->backbuffer_height; + height = client_rect.bottom - client_rect.top; if (height < surface_caps.minImageExtent.height) height = surface_caps.minImageExtent.height; else if (height > surface_caps.maxImageExtent.height) height = surface_caps.maxImageExtent.height; - if (width != desc->backbuffer_width || height != desc->backbuffer_height) + if (width != client_rect.right - client_rect.left || height != client_rect.bottom - client_rect.top) WARN("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", - desc->backbuffer_width, desc->backbuffer_height, + client_rect.right - client_rect.left, client_rect.bottom - client_rect.top, surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); -- 2.20.1

1 0

[tools 1/2] winetest: Distinguish Windows 8 from Windows 8.1.
by Francois Gouget April 9, 2021

April 9, 2021

But keep both in the same Windows 8 group. Reformat %idmap so there is roughly one group per line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 2 +- winetest/gather | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 12df56ae9..613c15118 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -354,7 +354,7 @@ my @idmatch = ( [ "win7", 2, 6, 1, 1, 0 ], [ "2008", 2, 6, 1, 3, 0 ], [ "win8", 2, 6, 2, undef, 0 ], - [ "win8", 2, 6, 3, undef, 0 ], + [ "win81", 2, 6, 3, undef, 0 ], [ "win10", 2, 10, 0, 1, 0 ], # [ "ce", 3, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, 0 ], diff --git a/winetest/gather b/winetest/gather index ae754d977..bb83c5ee3 100755 --- a/winetest/gather +++ b/winetest/gather @@ -165,14 +165,23 @@ my %solaris = (name => "Solaris"); my %wine = (name => "Wine"); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, \%win10, +my @groups = (\%w95, \%w98, \%me, + \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, + \%vista, \%w2k8, \%win7, \%win8, + \%win10, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); # Map dissect's IDs to the above hashes -my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, win8=>\%win8, win10=>\%win10, - unknown=>\%unknown, wine=>\%wine, linux=>\%linux, mac=>\%mac, bsd=>\%bsd, - solaris=>\%solaris); +my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, + nt3 => \%nt3, nt4 => \%nt4, 2000 => \%w2k, + xp => \%xp, 2003 => \%w2k3, + vista => \%vista, 2008 => \%w2k8, + win7 => \%win7, + win8 => \%win8, win81 => \%win8, + win10 => \%win10, + unknown => \%unknown, + wine => \%wine, linux => \%linux, mac => \%mac, + bsd => \%bsd, solaris => \%solaris); # -- 2.20.1

1 1

[tools] winetest: Allow overriding $workdir from the command line.
by Francois Gouget April 9, 2021

April 9, 2021

$workdir is typically already set in winetest.conf and modifying that file should not be necessary to use the --workdir option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-index | 4 ++-- winetest/dissect | 5 ++--- winetest/gather | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index f2e3dcf6d..5903f80ab 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -113,7 +113,7 @@ my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \% # Command line processing # -my $usage; +my ($opt_workdir, $usage); sub check_opt_val($$) { @@ -138,7 +138,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--help") { diff --git a/winetest/dissect b/winetest/dissect index c681c7d11..12df56ae9 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -28,7 +28,6 @@ # created to signal the change in the given build. # # To test this script: -# - Make sure $workdir is not set in winetest.conf # - Put a test report in queue/rep1/report # - Run ./dissect # - Examine the result in data/ @@ -112,7 +111,7 @@ sub short_date($) # Command line processing # -my ($update, $report, $usage); +my ($opt_workdir, $update, $report, $usage); sub check_opt_val($$) { @@ -137,7 +136,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--update") { diff --git a/winetest/gather b/winetest/gather index 302def437..09e4dfff1 100755 --- a/winetest/gather +++ b/winetest/gather @@ -26,7 +26,6 @@ # level. # # To test this script: -# - Make sure $workdir is not set in winetest.conf # - After running dissect, run ./gather # - Examine the result in data/ # @@ -180,7 +179,7 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Command line processing # -my ($builddir, $usage); +my ($opt_workdir, $builddir, $usage); sub check_opt_val($$) { @@ -205,7 +204,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--update") { -- 2.20.1

1 0

[tools] winetest/gather: Use the report platform as the column header.
by Francois Gouget April 9, 2021

April 9, 2021

A group index page may contain reports from different but related platforms, for instance Windows 8 and 8.1, or Windows 10 1507 and 1607. This allows immediately identifying a report's exact Windows version. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This seems more useful than repeating the group name which is already present in the page title. This patch uses the report id as is instead of trying to build a pretty name like "Windows 8.1". It's simpler, seems readable enough, and has the advantage of being short which is good as there are many columns. --- winetest/gather | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index 09e4dfff1..ae754d977 100755 --- a/winetest/gather +++ b/winetest/gather @@ -294,9 +294,12 @@ foreach my $file (glob "$builddir/*/summary.txt") { next; } - my $report = { group => $group}; - $report->{tag} = @tag?"@tag":""; - $report->{dir} = $dir; + my $report = { + id => $id, + group => $group, + tag => @tag ? "@tag" : "", + dir => $dir, + }; if (!open TEST, "<$file") { error("could not open '$file' for reading: $!\n"); next; @@ -522,7 +525,7 @@ sub build_header_footer($) if (!defined $msg) { $msg = <<"EOF"; - $group->{name} + $report->{id} <a href=\"$report->{dir}/version.html\">$report->{tag}</a> EOF chop $msg; -- 2.20.1

1 0

[tools] winetest/build-index: Delete obsolete test unit HTML files.
by Francois Gouget April 9, 2021

April 9, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is not just about removing old test files, but also garbled test names that resulted from missing linefeeds, or concurrency issues. For instance 000007rsaenh:rsaenh and 006s:font. --- winetest/build-index | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/winetest/build-index b/winetest/build-index index 5903f80ab..94453f4ab 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -341,6 +341,22 @@ EOF } } +# And delete obsolete test files +opendir(DIR, "data/tests") or die "could not open the 'data/tests' directory: $!"; +foreach my $entry (readdir(DIR)) +{ + next if ($entry eq "." or $entry eq ".."); + my $test = $entry; + $test =~ s/\.html$//; + next if ($alltests{$test}); + if (!unlink "data/tests/$entry") + { + error("could not delete 'data/tests/$entry': $!\n"); + } + +} +closedir(DIR); + # # Read each build's total.txt file -- 2.20.1

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud April 9, 2021

April 9, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/po/nl.po b/po/nl.po index f5b2554991d..e5ea842cfea 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-03-26 15:45+0100\n" +"PO-Revision-Date: 2021-04-09 10:15+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -3974,7 +3974,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Kan de eigenschap '|' niet definiëren: object is niet uitbreidbaar" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -14566,10 +14566,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "De bewerking is succesvol voltooid\n" +msgstr "reg: De bewerking is succesvol voltooid\n" #: programs/reg/reg.rc:117 msgid "reg: Invalid registry key\n" @@ -14584,13 +14582,8 @@ msgid "reg: Unable to access remote machine\n" msgstr "reg: Kan de computer op afstand niet benaderen\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "" -"reg: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +msgstr "reg: Kan de gegeven registerwaarde niet vinden\n" #: programs/reg/reg.rc:121 msgid "reg: Unsupported registry data type [%1]\n" @@ -14613,10 +14606,8 @@ msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgstr "De registerwaarde '%1' bestand bestaat al. Wilt u het vervangen?" #: programs/reg/reg.rc:129 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "De register bewerking is afgebroken\n" +msgstr "reg: De register bewerking is afgebroken\n" #: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -14778,19 +14769,12 @@ msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "" -"reg: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +msgstr "reg: Kan de gegeven registersleutel niet vinden\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Onmogelijk om de registersleutel '%1' te openen.\n" +msgstr "reg: Importeren van de registersleutel '%1' is niet mogelijk.\n" #: programs/reg/reg.rc:179 msgid "" @@ -14801,6 +14785,13 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" /reg:32\n" +" Open de 32-bits weergave van het register.\n" +"\n" +" /reg:64\n" +" Open de 64-bits weergave van het register.\n" +"\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" -- 2.31.0

1 0

[PATCH 1/6] ntoskrnl/tests: Properly support device removal.
by Zebediah Figura April 9, 2021

April 9, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver_pnp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index b8d97f9cfb5..ecaaf9afdbc 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -50,6 +50,8 @@ static NTSTATUS fdo_pnp(IRP *irp) break; case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_STOP_DEVICE: irp->IoStatus.Status = STATUS_SUCCESS; break; -- 2.30.2

2 10

[PATCH] po: Update Finnish translation.
by Lauri Kenttä April 9, 2021

April 9, 2021

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/po/fi.po b/po/fi.po index cffeda4b6e2..9e0dbcb51c6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3953,7 +3953,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Ominaisuutta '|' ei voi määritellä: objekti ei ole laajennettava" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -14456,10 +14456,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "Toiminnon suorittaminen onnistui\n" +msgstr "reg: Toiminnon suorittaminen onnistui\n" #: programs/reg/reg.rc:117 msgid "reg: Invalid registry key\n" @@ -14474,11 +14472,8 @@ msgid "reg: Unable to access remote machine\n" msgstr "reg: Ei pääsyä etäkoneelle\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "reg: Annettua rekisteriarvoa ei löydy\n" #: programs/reg/reg.rc:121 msgid "reg: Unsupported registry data type [%1]\n" @@ -14501,10 +14496,8 @@ msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?" #: programs/reg/reg.rc:129 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "Rekisterin toimenpide peruttiin\n" +msgstr "reg: Rekisterin toimenpide peruttiin\n" #: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -14662,17 +14655,12 @@ msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "reg: Annettua rekisteriavainta ei löydy\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "reg: Rekisteriavaimen '%1' tuonti ei onnistu\n" #: programs/reg/reg.rc:179 msgid "" @@ -14683,6 +14671,12 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Käytä rekisterin 32-bittistä näkymää.\n" +"\n" +" /reg:64\n" +" Käytä rekisterin 64-bittistä näkymää.\n" +"\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" -- 2.31.1

1 0