wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Francois Gouget : qcap: Make v4l_device_create() static.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 80b37cd512547588d07af68ec3771c6781662eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b37cd512547588d07af68e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:36:49 2021 +0200 qcap: Make v4l_device_create() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 82af4dba9e1..12fbe8162e0 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -401,7 +401,7 @@ static LONG CDECL v4l_device_get_caps_count(struct video_capture_device *device) return device->caps_count; } -struct video_capture_device * CDECL v4l_device_create(USHORT index) +static struct video_capture_device * CDECL v4l_device_create(USHORT index) { struct v4l2_frmsizeenum frmsize = {0}; struct video_capture_device *device;

1 0

Zebediah Figura : d3dcompiler: Rip out the HLSL compiler.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 85fa778f937abdc7f60177ff40e079b11d38df99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85fa778f937abdc7f60177ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 26 12:03:01 2021 -0500 d3dcompiler: Rip out the HLSL compiler. The compiler is completely non-functional as-is, and lives in libvkd3d-shader now. When a vkd3d release is made d3dcompiler will access it via the libvkd3d-shader public API. Accordingly there's no reason to keep it around in wine's d3dcompiler. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 2 - dlls/d3dcompiler_34/Makefile.in | 2 - dlls/d3dcompiler_35/Makefile.in | 2 - dlls/d3dcompiler_36/Makefile.in | 2 - dlls/d3dcompiler_37/Makefile.in | 2 - dlls/d3dcompiler_38/Makefile.in | 2 - dlls/d3dcompiler_39/Makefile.in | 2 - dlls/d3dcompiler_40/Makefile.in | 2 - dlls/d3dcompiler_41/Makefile.in | 2 - dlls/d3dcompiler_42/Makefile.in | 2 - dlls/d3dcompiler_43/Makefile.in | 2 - dlls/d3dcompiler_43/compiler.c | 180 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 607 ------ dlls/d3dcompiler_43/hlsl.l | 292 --- dlls/d3dcompiler_43/hlsl.y | 3059 ----------------------------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 9 +- dlls/d3dcompiler_43/utils.c | 1530 --------------- dlls/d3dcompiler_46/Makefile.in | 2 - dlls/d3dcompiler_47/Makefile.in | 2 - 19 files changed, 10 insertions(+), 5693 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85fa778f937abdc7f601…

1 0

Nikolay Sivov : d3dcompiler/tests: Add a D3DDisassemble() test with sm2 shader.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 0861b5447ff4dcd66b2febad204e1c66acdfa1ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0861b5447ff4dcd66b2febad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 11:42:57 2021 +0300 d3dcompiler/tests: Add a D3DDisassemble() test with sm2 shader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/asm.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 749b1153267..bc5af487627 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -31,6 +31,7 @@ static HRESULT (WINAPI *pD3DAssemble)(const void *data, SIZE_T datasize, const c const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT flags, ID3DBlob **shader, ID3DBlob **error_messages); static pD3DPreprocess ppD3DPreprocess; +static pD3DDisassemble ppD3DDisassemble; struct shader_test { const char *text; @@ -1721,6 +1722,41 @@ static void d3dpreprocess_test(void) if (shader) ID3D10Blob_Release(shader); } +static const DWORD vs_2_0[] = +{ + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ + 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ + 0x0200001f, 0x80000005, 0x900f0003, /* dcl_texcoord0 v3 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000001, 0xd00f0001, 0x90e40002, /* mov oD1, v2 */ + 0x02000001, 0xe0070000, 0x90e40003, /* mov oT0.xyz, v3 */ + 0x02000001, 0xc00f0001, 0x90ff0002, /* mov oFog, v2.w */ + 0x02000001, 0xc00f0002, 0x90ff0001, /* mov oPts, v1.w */ + 0x0000ffff +}; + +static void test_disassemble_shader(void) +{ + ID3DBlob *blob; + HRESULT hr; + + hr = ppD3DDisassemble(vs_2_0, 0, 0, NULL, &blob); +todo_wine +#if D3D_COMPILER_VERSION == 47 + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); +#else + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); +#endif + + hr = ppD3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10Blob_Release(blob); +} + static BOOL load_d3dcompiler(void) { HMODULE module; @@ -1733,6 +1769,7 @@ static BOOL load_d3dcompiler(void) pD3DAssemble = (void*)GetProcAddress(module, "D3DAssemble"); ppD3DPreprocess = (void*)GetProcAddress(module, "D3DPreprocess"); + ppD3DDisassemble = (void *)GetProcAddress(module, "D3DDisassemble"); return TRUE; } @@ -1761,4 +1798,5 @@ START_TEST(asm) assembleshader_test(); d3dpreprocess_test(); + test_disassemble_shader(); }

1 0

Nikolay Sivov : d3dx9: Forward D3DXDisassembleShader() to d3dcompiler.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 4ad4e4a133e92f923f9eb3da5547c56601c81cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ad4e4a133e92f923f9eb3da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 11:41:17 2021 +0300 d3dx9: Forward D3DXDisassembleShader() to d3dcompiler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 7033972af36..fe0f99180ac 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2336,10 +2336,13 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample return D3D_OK; } -HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, ID3DXBuffer **disassembly) +HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, + ID3DXBuffer **buffer) { - FIXME("%p %d %s %p: stub\n", shader, colorcode, debugstr_a(comments), disassembly); - return E_OUTOFMEMORY; + TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer); + + return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0, + comments, (ID3DBlob **)buffer); } struct d3dx9_texture_shader

1 0

Nikolay Sivov : d3dx10_40/tests: Enable tests.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: cd0cb0cbd590fc2e21dfe90fdb6865adbe4f3b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd0cb0cbd590fc2e21dfe90f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:33:38 2021 +0300 d3dx10_40/tests: Enable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_40/Makefile.in | 1 + dlls/d3dx10_40/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 020ca989d4f..ca7863420b4 100755 --- a/configure +++ b/configure @@ -20386,6 +20386,7 @@ wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 wine_fn_config_makefile dlls/d3dx10_40 enable_d3dx10_40 +wine_fn_config_makefile dlls/d3dx10_40/tests enable_tests wine_fn_config_makefile dlls/d3dx10_41 enable_d3dx10_41 wine_fn_config_makefile dlls/d3dx10_41/tests enable_tests wine_fn_config_makefile dlls/d3dx10_42 enable_d3dx10_42 diff --git a/configure.ac b/configure.ac index f139c59be74..594794ed93c 100644 --- a/configure.ac +++ b/configure.ac @@ -3086,6 +3086,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_40/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in index af15cc5c921..3f1c534702a 100644 --- a/dlls/d3dx10_40/Makefile.in +++ b/dlls/d3dx10_40/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_40.dll +IMPORTLIB = d3dx10_40 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_40/tests/Makefile.in b/dlls/d3dx10_40/tests/Makefile.in new file mode 100644 index 00000000000..ba566ff908d --- /dev/null +++ b/dlls/d3dx10_40/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_40.dll +IMPORTS = d3dx10_40 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Nikolay Sivov : d3d10/effect: Store explicit bind point value for constant buffers and object variables.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 6cd12a9a432f0ed17de7ba98da5e4fa5bede4e4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cd12a9a432f0ed17de7ba98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:13 2021 +0300 d3d10/effect: Store explicit bind point value for constant buffers and object variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 751c39dc895..5e406110988 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -199,6 +199,7 @@ struct d3d10_effect_variable DWORD annotation_count; DWORD flag; DWORD data_size; + DWORD explicit_bind_point; struct d3d10_effect *effect; struct d3d10_effect_variable *elements; struct d3d10_effect_variable *members; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index fe494e952d6..acc7199138b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1165,6 +1165,8 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, } set_variable_vtbl(v); + v->explicit_bind_point = ~0u; + return copy_variableinfo_from_type(v); } @@ -1927,7 +1929,8 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - skip_dword_unknown("local variable", ptr, 1); + read_dword(ptr, &v->explicit_bind_point); + TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); switch (v->type->basetype) { @@ -2191,7 +2194,8 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, read_dword(ptr, &l->type->member_count); TRACE("Local buffer member count: %#x.\n", l->type->member_count); - skip_dword_unknown("local buffer", ptr, 1); + read_dword(ptr, &l->explicit_bind_point); + TRACE("Local buffer explicit bind point: %#x.\n", l->explicit_bind_point); read_dword(ptr, &l->annotation_count); TRACE("Local buffer has %u annotations.\n", l->annotation_count);

1 0

Nikolay Sivov : d3d10/effect: Clear up unknown fields in effect header.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 03c88ad6220f77fd32cf2b069e55bf53e908b02c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c88ad6220f77fd32cf2b06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:12 2021 +0300 d3d10/effect: Clear up unknown fields in effect header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9312cfec6f6..fe494e952d6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2442,7 +2442,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr = data; - DWORD unknown; + DWORD unused; if (!require_space(0, 19, sizeof(DWORD), data_size)) { @@ -2464,14 +2464,13 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Object count: %u\n", e->local_variable_count); read_dword(&ptr, &e->sharedbuffers_count); - TRACE("Sharedbuffers count: %u\n", e->sharedbuffers_count); + TRACE("Pool buffer count: %u\n", e->sharedbuffers_count); - /* Number of variables in shared buffers? */ - read_dword(&ptr, &unknown); - FIXME("Unknown 0: %u\n", unknown); + read_dword(&ptr, &unused); + TRACE("Pool variable count: %u\n", unused); read_dword(&ptr, &e->sharedobjects_count); - TRACE("Sharedobjects count: %u\n", e->sharedobjects_count); + TRACE("Pool objects count: %u\n", e->sharedobjects_count); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -2479,8 +2478,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->index_offset); TRACE("Index offset: %#x\n", e->index_offset); - read_dword(&ptr, &unknown); - FIXME("Unknown 1: %u\n", unknown); + read_dword(&ptr, &unused); + TRACE("String count: %u\n", unused); read_dword(&ptr, &e->texture_count); TRACE("Texture count: %u\n", e->texture_count);

1 0

Nikolay Sivov : d3d10/effect: Warn only when ignored default variable value is specified.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 624b33bfb83715a5431753e1f94e28dfad5af64a URL: https://source.winehq.org/git/wine.git/?a=commit;h=624b33bfb83715a5431753e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:11 2021 +0300 d3d10/effect: Warn only when ignored default variable value is specified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3b3d48c50a8..9312cfec6f6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1814,10 +1814,10 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, return S_OK; } -static HRESULT parse_fx10_variable(const char *data, size_t data_size, +static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *v) { - DWORD offset; + DWORD offset, default_value_offset; unsigned int i; HRESULT hr; @@ -1837,11 +1837,14 @@ static HRESULT parse_fx10_variable(const char *data, size_t data_size, read_dword(ptr, &v->buffer_offset); TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); - skip_dword_unknown("variable", ptr, 1); + read_dword(ptr, &default_value_offset); read_dword(ptr, &v->flag); TRACE("Variable flag: %#x.\n", v->flag); + if (default_value_offset) + FIXME("Set default variable value.\n"); + read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); @@ -2230,7 +2233,7 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, v->buffer = l; v->effect = l->effect; - if (FAILED(hr = parse_fx10_variable(data, data_size, ptr, v))) + if (FAILED(hr = parse_fx10_numeric_variable(data, data_size, ptr, v))) return hr; /*

1 0

Michael Stefaniuc : d3dx10: Remove redundant NULL check before heap_free().
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 460ca9a9b5ef0fd667cac3281eea8aac15076909 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460ca9a9b5ef0fd667cac328… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 25 22:39:07 2021 +0200 d3dx10: Remove redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8d30aef8648..32215b0a99a 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -709,8 +709,7 @@ end: IWICFormatConverter_Release(converter); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); - if (buffer) - heap_free(buffer); + heap_free(buffer); if (frame) IWICBitmapFrameDecode_Release(frame); if (decoder)

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 245165e47f6a3b4c23087d44f0fb821a505dd143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245165e47f6a3b4c23087d44… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Aug 27 10:13:54 2021 +0200 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 92 +++++++++++++++++-------------------------------------------- 1 file changed, 26 insertions(+), 66 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index a5e42fd9831..f55f847a4c7 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -21,26 +21,20 @@ msgid "Security" msgstr "Sikkerhet" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "Br&ukernavn:" +msgstr "&Gruppe eller brukernavn:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Gul" +msgstr "Tillat" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Nekt" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "Tilgang nektet.\n" +msgstr "Tilgang for %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3769,7 +3763,7 @@ msgstr "Spillkontrollere" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Test og konfigurer spillkontrollere." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3875,7 +3869,7 @@ msgstr "Forventet '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript kompileringsfeil" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" @@ -6969,38 +6963,28 @@ msgid "Connection reset by peer.\n" msgstr "Tilkobling nullstilt av likemann.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Ikke implementert" +msgstr "Ikke implementert.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC-kall feilet.\n" +msgstr "Kall feilet.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "Fant ingen signatur i filen.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Ugyldig nivå.\n" +msgstr "Ugyldig kall.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Verdi er ikke tilgjengelig.\n" +msgstr "Ressursen er for øyeblikket ikke tilgjengelig.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Klassenavn:" +msgstr "Klassisk Blå" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -9200,32 +9184,24 @@ msgid "Provider" msgstr "Tilbyder" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Velg formatet du ønsker å bruke:" +msgstr "Velg data du ønsker å koble til:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Nettverksforbindelser" +msgstr "Nettverksforbindelse" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Velg formatet du ønsker å bruke:" +msgstr "Spesifiser følgende for å koble til ODBC-data:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Spesifiser datakilden:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Skriv inn navnet ditt" +msgstr "Bruk &datakilde-navnet" #: dlls/oledb32/version.rc:74 #, fuzzy @@ -9250,64 +9226,48 @@ msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "Br&ukernavn:" +msgstr "Bruker&navn:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Tom side" +msgstr "&Blankt passord" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Feil passord.\n" +msgstr "Tillat lagring av pa%ssord" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Tilbakestill tilkoblinger" +msgstr "&Test tilkobling" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avansert" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Nettverksressurs" +msgstr "Nettverksinnstillinger" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Ugyldig personifiseringsnivå.\n" +msgstr "Person&ifiseringsnivå:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" msgstr "" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Tilkoblet" +msgstr "Koble til:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "sekunder" +msgstr "sekunder." #: dlls/oledb32/version.rc:104 #, fuzzy @@ -10371,7 +10331,7 @@ msgstr "Nedlastinger" #: dlls/shell32/shell32.rc:169 msgid "Unable to create new Folder: Permission denied." -msgstr "Kunne ikke opprette ny mappe: tilgang nektet." +msgstr "Kunne ikke opprette ny mappe: Tilgang nektet." #: dlls/shell32/shell32.rc:170 msgid "Error during creation of a new folder" @@ -13957,7 +13917,7 @@ msgstr "Ethernet" #: programs/ipconfig/ipconfig.rc:35 msgid "Connection-specific DNS suffix" -msgstr "TIlkoblingsspesifikt DNS-suffiks" +msgstr "Tilkoblingsspesifikt DNS-suffiks" #: programs/ipconfig/ipconfig.rc:36 msgid "IPv4 address"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021