March 2021 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Correctly handle modifiers on instructions with multiple destination registers.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 65b3279baed3db067f2d750af97160c787f00d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=65b3279baed3db067f2d750a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 5 17:06:22 2021 +0100 wined3d: Correctly handle modifiers on instructions with multiple destination registers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 108 ++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65b3279baed3db067f2d…

1 0

Georg Lehmann : winevulkan: Rework VkEnumValue creation.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 3a359feb85154c29df947efe798369c158854fb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a359feb85154c29df947efe… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 5 14:32:44 2021 +0100 winevulkan: Rework VkEnumValue creation. Makes future changes to VkEnumValue easier by deduplicating creation logic. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 49 +++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1243f211b5e..d3bf8906efc 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -357,9 +357,9 @@ class VkDefine(object): class VkEnum(object): - def __init__(self, name, values, alias=None): + def __init__(self, name, alias=None): self.name = name - self.values = values + self.values = [] if alias == None else alias.values self.required = False self.alias = alias self.aliased_by = [] @@ -367,7 +367,7 @@ class VkEnum(object): @staticmethod def from_alias(enum, alias): name = enum.attrib.get("name") - aliasee = VkEnum(name, alias.values, alias=alias) + aliasee = VkEnum(name, alias=alias) alias.add_aliased_by(aliasee) return aliasee @@ -375,34 +375,43 @@ class VkEnum(object): @staticmethod def from_xml(enum): name = enum.attrib.get("name") - values = [] + result = VkEnum(name) for v in enum.findall("enum"): + value_name = v.attrib.get("name") # Value is either a value or a bitpos, only one can exist. value = v.attrib.get("value") alias_name = v.attrib.get("alias") if alias_name: - alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) + result.create_alias(value_name, alias_name) elif value: - # Some values are in hex form. We want to preserve the hex representation - # at least when we convert back to a string. Internally we want to use int. - if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) - else: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) + result.create_value(value_name, value) else: # bitmask - value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) + result.create_bitpos(value_name, int(v.attrib.get("bitpos"))) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect # the size definition. max_name = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2', name).upper() + "_MAX_ENUM" - values.append(VkEnumValue(max_name, value=0x7fffffff, hex=True)) + result.create_value(max_name, "0x7fffffff") + + return result + + def create_alias(self, name, alias_name): + """ Create an aliased value for this enum """ + self.add(VkEnumValue(name, alias=alias_name)) + + def create_value(self, name, value): + """ Create a new value for this enum """ + # Some values are in hex form. We want to preserve the hex representation + # at least when we convert back to a string. Internally we want to use int. + hex = "0x" in value + self.add(VkEnumValue(name, value=int(value, 0), hex=hex)) - return VkEnum(name, values) + def create_bitpos(self, name, pos): + """ Create a new bitmask value for this enum """ + self.add(VkEnumValue(name, value=(1 << pos), hex=True)) def add(self, value): """ Add a value to enum. """ @@ -2874,7 +2883,7 @@ class VkRegistry(object): if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) + enum.create_bitpos(enum_elem.attrib["name"], int(enum_elem.attrib["bitpos"])) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part @@ -2891,12 +2900,12 @@ class VkRegistry(object): if direction is not None: value = -value - enum.add(VkEnumValue(enum_elem.attrib["name"], value=value)) + enum.create_value(enum_elem.attrib["name"], str(value)) elif "value" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]))) + enum.create_value(enum_elem.attrib["name"], enum_elem.attrib["value"]) elif "alias" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) + enum.create_alias(enum_elem.attrib["name"], enum_elem.attrib["alias"]) elif "value" in enum_elem.keys(): # Constants are not aliased, no need to add them here, they'll get added later on.

1 0

Zebediah Figura : vkd3d-shader: Use yy_scan_bytes() instead of yy_scan_string().
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: vkd3d Branch: master Commit: 001328e08497754a9ff8ceb66d563977a4563970 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=001328e08497754a9ff8ceb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:28 2021 -0600 vkd3d-shader: Use yy_scan_bytes() instead of yy_scan_string(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.l | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 19bfc93..e78f05c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1618,7 +1618,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) hlsl_free_type(type); } -int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info *compile_info, +int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; @@ -1646,7 +1646,7 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info if (!hlsl_ctx_init(&ctx, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (hlsl_lexer_compile(&ctx, text) == 2) + if (hlsl_lexer_compile(&ctx, hlsl) == 2) { hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_OUT_OF_MEMORY; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4af021e..7673440 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -572,6 +572,6 @@ unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) DECLSPEC_HIDDEN; +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) DECLSPEC_HIDDEN; #endif diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index da54d57..cee98ea 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -282,13 +282,13 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *lloc) ctx->location.column += yyget_leng(ctx->scanner); } -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) { YY_BUFFER_STATE buffer; int ret; yylex_init_extra(ctx, &ctx->scanner); - buffer = yy_scan_string(text, ctx->scanner); + buffer = yy_scan_bytes(hlsl->code, hlsl->size, ctx->scanner); yy_switch_to_buffer(buffer, ctx->scanner); ret = hlsl_yyparse(ctx->scanner, ctx); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5113624..2308b89 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1047,7 +1047,7 @@ static int compile_hlsl(const struct vkd3d_shader_compile_info *compile_info, if ((ret = preproc_lexer_parse(compile_info, &preprocessed, message_context))) return ret; - ret = hlsl_compile_shader(preprocessed.code, compile_info, out, message_context); + ret = hlsl_compile_shader(&preprocessed, compile_info, out, message_context); vkd3d_shader_free_shader_code(&preprocessed); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cf66c67..6d756e4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -949,7 +949,7 @@ void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksu int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; -int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info *compile_info, +int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type(

1 0

Zebediah Figura : vkd3d-shader: Watch for allocation failure from yyparse().
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: vkd3d Branch: master Commit: b35fd8628e2bfb2d448cc0671a210217fe8c19e1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b35fd8628e2bfb2d448cc06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:25 2021 -0600 vkd3d-shader: Watch for allocation failure from yyparse(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 02fa484..19bfc93 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1646,7 +1646,11 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info if (!hlsl_ctx_init(&ctx, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - hlsl_lexer_compile(&ctx, text); + if (hlsl_lexer_compile(&ctx, text) == 2) + { + hlsl_ctx_cleanup(&ctx); + return VKD3D_ERROR_OUT_OF_MEMORY; + } if (ctx.failed) {

1 0

Francois Gouget : testbot/web: Make the CollectionBlock <th> cells sticky.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: tools Branch: master Commit: 725cb7f6f1ccc09507714b6009c805a496047baf URL: https://source.winehq.org/git/tools.git/?a=commit;h=725cb7f6f1ccc09507714b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 8 01:50:09 2021 +0100 testbot/web: Make the CollectionBlock <th> cells sticky. This keeps the table header visible, making long tables easier to read. The header disappears when scrolling past the table so this does not impact the remainder of the page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/WineTestBot.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 3fccbd2..6d170b1 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -232,6 +232,8 @@ h2 padding: 4px; margin: 0; border: 1px solid white; + position: sticky; + top: 0; } .CollectionBlock td

1 0

Francois Gouget : testbot/web: Use <thead> for the CollectionBlock table headers.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: tools Branch: master Commit: 0b2642d3c6c4e5ebd89e0aa2ea08de4dddb6c5b8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0b2642d3c6c4e5ebd89e0aa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 8 01:50:50 2021 +0100 testbot/web: Use <thead> for the CollectionBlock table headers. It usually does not make any difference but is good practice. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index b523d14..058bb47 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -107,10 +107,12 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; - print "<tbody>\n"; + print "<thead>\n"; my $Actions = $self->CallGetItemActions(); $self->CallGenerateHeaderRow($PropertyDescriptors, $Actions); + print "</thead>\n"; + print "<tbody>\n"; my $DetailsPage = $self->CallGetDetailsPage(); my $Row = 0; my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys());

1 0

Francois Gouget : testbot/PatchUtils: Fix the module name for directories containing dots.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: tools Branch: master Commit: c4d02668c9e46a4063055b5e9b5be1cd1d1aa7f1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4d02668c9e46a4063055b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 8 13:40:51 2021 +0100 testbot/PatchUtils: Fix the module name for directories containing dots. Wine forces dlls that contain dots in their names to be implemented in a folder ending in '.dll'. But the module name and test executables don't have this extra 'extension' and thus deriving them from the patched filename requires special treatment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index aeb8743..37b1b77 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -44,6 +44,20 @@ use WineTestBot::Utils; # Source repository maintenance # +sub _Dir2ModuleName($$) +{ + my ($Root, $Dir) = @_; + + # Add a .exe extension to program directory names, but not if they already + # contain some other extension. + return "$Dir.exe" if ($Root eq "programs" and $Dir !~ /\./); + + # Dll directory names can normally be used as is, except if a '.dll' + # extension was added because they contain dots. + $Dir =~ s/\.dll$//; + return $Dir; +} + =pod =over 12 @@ -107,7 +121,7 @@ sub _LoadWineFiles() my ($Root, $Module, $File) = ($1, $2, $3); next if ($File eq "testlist.c"); next if ($File !~ /\.(?:c|spec)$/); - $Module .= ".exe" if ($Root eq "programs" and $Module !~ /\./); + $Module = _Dir2ModuleName($Root, $Module); $_TestList->{$Module}->{$File} = 1; } } @@ -177,8 +191,7 @@ sub _CreateTestInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - # Don't add an extension to programs that have one already - my $Module = ($Root eq "programs" and $Dir !~ /\./) ? "$Dir.exe" : $Dir; + my $Module = _Dir2ModuleName($Root, $Dir); $Impacts->{BuildModules}->{$Module} = 1; $Impacts->{IsWinePatch} = 1;

1 0

Francois Gouget : testbot/web: Remove a duplicate </tbody> on the Stats page.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: tools Branch: master Commit: e2940cb5dae99a8528628df512640588443ea189 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e2940cb5dae99a8528628df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 8 01:50:29 2021 +0100 testbot/web: Remove a duplicate </tbody> on the Stats page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 4a70cb0..bf7f9ba 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -429,7 +429,7 @@ sub GenerateFooter($) print "<p>The errors section shows how many <b>Timeouts</b> occurred, that is how many tasks failed to complete within the allotted time; how many failed due to a <b>TestBot error</b>; and how many had to be rerun due to a <b>Transient error</b> such as a network connection issue.</p>\n"; print "</td></tr></tbody>\n"; - print "</tbody></table></div>\n"; + print "</table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; print "</div>\n"; }

1 0

Francois Gouget : configure: Fix the libsane pkg-config name.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: wine Branch: master Commit: 74c0da2d71e95f3e6bd6c8b440652933771b27d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c0da2d71e95f3e6bd6c8b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 5 17:53:31 2021 +0100 configure: Fix the libsane pkg-config name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++------ configure.ac | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 13eecaf05d7..3b5a50cef53 100755 --- a/configure +++ b/configure @@ -2685,8 +2685,8 @@ Some influential environment variables: GNUTLS_CFLAGS C compiler flags for gnutls, overriding pkg-config GNUTLS_LIBS Linker flags for gnutls, overriding pkg-config - SANE_CFLAGS C compiler flags for libsane, overriding pkg-config - SANE_LIBS Linker flags for libsane, overriding pkg-config + SANE_CFLAGS C compiler flags for sane-backends, overriding pkg-config + SANE_LIBS Linker flags for sane-backends, overriding pkg-config USB_CFLAGS C compiler flags for libusb-1.0, overriding pkg-config USB_LIBS Linker flags for libusb-1.0, overriding pkg-config GPHOTO2_CFLAGS @@ -13684,19 +13684,19 @@ if test "x$with_sane" != "xno" then if ${SANE_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : - SANE_CFLAGS=`$PKG_CONFIG --cflags libsane 2>/dev/null` + SANE_CFLAGS=`$PKG_CONFIG --cflags sane-backends 2>/dev/null` fi fi test "$cross_compiling" = yes || SANE_CFLAGS=${SANE_CFLAGS:-`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`} if ${SANE_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : - SANE_LIBS=`$PKG_CONFIG --libs libsane 2>/dev/null` + SANE_LIBS=`$PKG_CONFIG --libs sane-backends 2>/dev/null` fi fi test "$cross_compiling" = yes || SANE_LIBS=${SANE_LIBS:-`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`} -$as_echo "$as_me:${as_lineno-$LINENO}: libsane cflags: $SANE_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: libsane libs: $SANE_LIBS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: sane-backends cflags: $SANE_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: sane-backends libs: $SANE_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SANE_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default" diff --git a/configure.ac b/configure.ac index 6a4e9568c40..8ed3b0c2669 100644 --- a/configure.ac +++ b/configure.ac @@ -1435,7 +1435,7 @@ WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], dnl **** Check for SANE **** if test "x$with_sane" != "xno" then - WINE_PACKAGE_FLAGS(SANE,[libsane],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`], + WINE_PACKAGE_FLAGS(SANE,[sane-backends],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`], [AC_CHECK_HEADER(sane/sane.h, [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])], [SANE_CFLAGS=""])])

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: wine Branch: master Commit: 12a890329a3d387a9086c4d041fe0c9e50674d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a890329a3d387a9086c4d0… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Mar 5 11:56:37 2021 +0100 po: Update Dutch translation. Add aclui translation and fix typo in winecfg Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7f33637cf23..9ada91f8700 100644 --- a/po/nl.po +++ b/po/nl.po @@ -19,26 +19,20 @@ msgid "Security" msgstr "Beveiliging" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Gebruikersnaam:" +msgstr "&Groeps- of gebruikersnamen:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Geel" +msgstr "Toestaan" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Weigeren" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Toegang geweigerd" +msgstr "Rechten voor %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -16169,7 +16163,7 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad " -"isgekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"is gekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " "programma de standaardinstellingen of programmaspecifieke instellingen " "gebruikt worden."

1 0