July 2017 - Wine-commits - list.winehq.org

Alex Henrie : msvcr120: Add acosh.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: f1dad14807ae9650c66d83ec35fbc016b91ac471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1dad14807ae9650c66d83ec3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:05:09 2017 +0200 msvcr120: Add acosh. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 45 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- include/config.h.in | 6 +++ 8 files changed, 67 insertions(+), 12 deletions(-) diff --git a/configure b/configure index f6053f1..199d4d8 100755 --- a/configure +++ b/configure @@ -17406,6 +17406,8 @@ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi for ac_func in \ + acosh \ + acoshf \ asinh \ asinhf \ cbrt \ diff --git a/configure.ac b/configure.ac index d557df8..3974dd5 100644 --- a/configure.ac +++ b/configure.ac @@ -2594,6 +2594,8 @@ then fi AC_CHECK_FUNCS(\ + acosh \ + acoshf \ asinh \ asinhf \ cbrt \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 5d2499b..5c64432 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -124,9 +124,9 @@ @ cdecl _yn(long double) ucrtbase._yn @ cdecl acos(double) ucrtbase.acos @ cdecl -arch=arm,x86_64 acosf(float) ucrtbase.acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) ucrtbase.acosh +@ cdecl acoshf(float) ucrtbase.acoshf +@ cdecl acoshl(double) ucrtbase.acoshl @ cdecl asin(double) ucrtbase.asin @ cdecl -arch=arm,x86_64 asinf(float) ucrtbase.asinf @ cdecl asinh(double) ucrtbase.asinh diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 989a3cb..7899622 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2011,9 +2011,9 @@ @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos @ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) MSVCR120_acosh +@ cdecl acoshf(float) MSVCR120_acoshf +@ cdecl acoshl(double) MSVCR120_acoshl @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 345bb51..9a5da20 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1677,9 +1677,9 @@ @ cdecl abs(long) msvcr120.abs @ cdecl acos(double) msvcr120.acos @ cdecl -arch=arm,x86_64 acosf(float) msvcr120.acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) msvcr120.acosh +@ cdecl acoshf(float) msvcr120.acoshf +@ cdecl acoshl(double) msvcr120.acoshl @ cdecl asctime(ptr) msvcr120.asctime @ cdecl asctime_s(ptr long ptr) msvcr120.asctime_s @ cdecl asin(double) msvcr120.asin diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 387aab3..17edf47 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2899,6 +2899,51 @@ LDOUBLE CDECL MSVCR120_asinhl(LDOUBLE x) } /********************************************************************* + * acosh (MSVCR120.@) + */ +double CDECL MSVCR120_acosh(double x) +{ + if (x < 1) *MSVCRT__errno() = MSVCRT_EDOM; + +#ifdef HAVE_ACOSH + return acosh(x); +#else + if (x < 1) { + MSVCRT_fenv_t env; + + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + if (!isfinite(x*x)) return log(2) + log(x); + return log(x + sqrt(x*x-1)); +#endif +} + +/********************************************************************* + * acoshf (MSVCR120.@) + */ +float CDECL MSVCR120_acoshf(float x) +{ +#ifdef HAVE_ACOSHF + if (x < 1) *MSVCRT__errno() = MSVCRT_EDOM; + + return acoshf(x); +#else + return MSVCR120_acosh(x); +#endif +} + +/********************************************************************* + * acoshl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_acoshl(LDOUBLE x) +{ + return MSVCR120_acosh(x); +} + +/********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) * scalbln (MSVCR120.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3e7c795..1eae072 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2153,9 +2153,9 @@ @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos @ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) MSVCR120_acosh +@ cdecl acoshf(float) MSVCR120_acoshf +@ cdecl acoshl(double) MSVCR120_acoshl @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin diff --git a/include/config.h.in b/include/config.h.in index c287559..4a9acca 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -10,6 +10,12 @@ /* Define to the file extension for executables. */ #undef EXEEXT +/* Define to 1 if you have the `acosh' function. */ +#undef HAVE_ACOSH + +/* Define to 1 if you have the `acoshf' function. */ +#undef HAVE_ACOSHF + /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H

1 0

Alex Henrie : msvcr120: Add atanh.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 860c1578e6ed130792ff6a9c5e5431ec005472ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c1578e6ed130792ff6a9c5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:05:19 2017 +0200 msvcr120: Add atanh. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 66 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- include/config.h.in | 6 ++ 8 files changed, 88 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 199d4d8..95cfa25 100755 --- a/configure +++ b/configure @@ -17410,6 +17410,8 @@ for ac_func in \ acoshf \ asinh \ asinhf \ + atanh \ + atanhf \ cbrt \ cbrtf \ erf \ diff --git a/configure.ac b/configure.ac index 3974dd5..77b04b9 100644 --- a/configure.ac +++ b/configure.ac @@ -2598,6 +2598,8 @@ AC_CHECK_FUNCS(\ acoshf \ asinh \ asinhf \ + atanh \ + atanhf \ cbrt \ cbrtf \ erf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 5c64432..fb5c350 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -136,9 +136,9 @@ @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f @ cdecl -arch=arm,x86_64 atanf(float) ucrtbase.atanf -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) ucrtbase.atanh +@ cdecl atanhf(float) ucrtbase.atanhf +@ cdecl atanhl(double) ucrtbase.atanhl @ stub cabs @ stub cabsf @ stub cabsl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7899622..323d5f4 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2025,9 +2025,9 @@ @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) MSVCR120_atanh +@ cdecl atanhf(float) MSVCR120_atanhf +@ cdecl atanhl(double) MSVCR120_atanhl @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9a5da20..73101c7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1691,9 +1691,9 @@ @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) msvcr120.atan2f -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) msvcr120.atanh +@ cdecl atanhf(float) msvcr120.atanhf +@ cdecl atanhl(double) msvcr120.atanhl @ cdecl -private atexit(ptr) msvcr120.atexit @ cdecl atof(str) msvcr120.atof @ cdecl atoi(str) msvcr120.atoi diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 17edf47..9eed9b8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2944,6 +2944,72 @@ LDOUBLE CDECL MSVCR120_acoshl(LDOUBLE x) } /********************************************************************* + * atanh (MSVCR120.@) + */ +double CDECL MSVCR120_atanh(double x) +{ + double ret; + + if (x > 1 || x < -1) { + MSVCRT_fenv_t env; + + *MSVCRT__errno() = MSVCRT_EDOM; + + /* on Linux atanh returns -NAN in this case */ + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + +#ifdef HAVE_ATANH + ret = atanh(x); +#else + if (-1e-6 < x && x < 1e-6) ret = x + x*x*x/3; + else ret = (log(1+x) - log(1-x)) / 2; +#endif + + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * atanhf (MSVCR120.@) + */ +float CDECL MSVCR120_atanhf(float x) +{ +#ifdef HAVE_ATANHF + double ret; + + if (x > 1 || x < -1) { + MSVCRT_fenv_t env; + + *MSVCRT__errno() = MSVCRT_EDOM; + + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + + ret = atanhf(x); + + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + return MSVCR120_atanh(x); +#endif +} + +/********************************************************************* + * atanhl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) +{ + return MSVCR120_atanh(x); +} + +/********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) * scalbln (MSVCR120.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1eae072..aacf361 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2167,9 +2167,9 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) MSVCR120_atanh +@ cdecl atanhf(float) MSVCR120_atanhf +@ cdecl atanhl(double) MSVCR120_atanhl @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol diff --git a/include/config.h.in b/include/config.h.in index 4a9acca..2e909fd 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -50,6 +50,12 @@ /* Define to 1 if you have the <asm/user.h> header file. */ #undef HAVE_ASM_USER_H +/* Define to 1 if you have the `atanh' function. */ +#undef HAVE_ATANH + +/* Define to 1 if you have the `atanhf' function. */ +#undef HAVE_ATANHF + /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H

1 0

Sebastian Lackner : wined3d: Return hr result in wined3d_event_query_create.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: c683372bca9a36fb55ad18c0d7d668de6aa0c95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c683372bca9a36fb55ad18c0d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 12 15:03:02 2017 +0200 wined3d: Return hr result in wined3d_event_query_create. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 7d726d0..f1e7803 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -945,7 +945,7 @@ static HRESULT wined3d_event_query_create(struct wined3d_device *device, { WARN("Event queries not supported.\n"); HeapFree(GetProcessHeap(), 0, object); - return WINED3DERR_NOTAVAILABLE; + return hr; } wined3d_query_init(&object->query, device, type, &object->signalled,

1 0

Józef Kucia : wined3d: Implement SM5 swapc instruction.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: af80b7afdd51c89fd7423a687dd7213f32a1f87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af80b7afdd51c89fd7423a687… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 13 00:35:46 2017 +0200 wined3d: Implement SM5 swapc instruction. Signed-off-by: Józef Kucia <jkucia(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 | 54 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1bd3a66..650f8ad 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4353,6 +4353,58 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_swapc(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct wined3d_shader_dst_param dst[2]; + struct glsl_src_param src[3]; + unsigned int i, j, k; + char mask_char[6]; + DWORD write_mask; + BOOL tmp_dst[2]; + + for (i = 0; i < ins->dst_count; ++i) + { + tmp_dst[i] = FALSE; + for (j = 0; j < ins->src_count; ++j) + { + if (ins->dst[i].reg.idx[0].offset == ins->src[j].reg.idx[0].offset + && ins->dst[i].reg.type == ins->src[j].reg.type) + tmp_dst[i] = TRUE; + } + } + + dst[0] = ins->dst[0]; + dst[1] = ins->dst[1]; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < ARRAY_SIZE(dst); ++j) + { + dst[j].write_mask = ins->dst[j].write_mask & (WINED3DSP_WRITEMASK_0 << i); + if (tmp_dst[j] && (write_mask = shader_glsl_get_write_mask(&dst[j], mask_char))) + shader_addline(buffer, "tmp%u%s = (", j, mask_char); + else if (!(write_mask = shader_glsl_append_dst_ext(buffer, ins, &dst[j], dst[j].reg.data_type))) + continue; + + for (k = 0; k < ARRAY_SIZE(src); ++k) + shader_glsl_add_src_param(ins, &ins->src[k], write_mask, &src[k]); + + shader_addline(buffer, "%sbool(%s) ? %s : %s);\n", !j ? "!" : "", + src[0].param_str, src[1].param_str, src[2].param_str); + } + } + + for (i = 0; i < ARRAY_SIZE(tmp_dst); ++i) + { + if (tmp_dst[i]) + { + shader_glsl_get_write_mask(&ins->dst[i], mask_char); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[i], ins->dst[i].reg.data_type); + shader_addline(ins->ctx->buffer, "tmp%u%s);\n", i, mask_char); + } + } +} + static void shader_glsl_conditional_move(const struct wined3d_shader_instruction *ins) { const char *condition_prefix, *condition_suffix; @@ -10805,7 +10857,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_raw_structured, /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, - /* WINED3DSIH_SWAPC */ NULL, + /* WINED3DSIH_SWAPC */ shader_glsl_swapc, /* WINED3DSIH_SWITCH */ shader_glsl_switch, /* WINED3DSIH_SYNC */ shader_glsl_sync, /* WINED3DSIH_TEX */ shader_glsl_tex,

1 0

Józef Kucia : d3d11/tests: Add test for swapc instruction.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 555dbd1ccda406eb61b71595dd686341debaed5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=555dbd1ccda406eb61b71595d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 13 00:35:47 2017 +0200 d3d11/tests: Add test for swapc instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 274 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=555dbd1ccda406eb61b71…

1 0

Jens Reyer : make_unicode: Update data tables to Unicode 10.0.0.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: b736dbe933465562e1225f541b59846276b67c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b736dbe933465562e1225f541… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Sat Jul 8 15:45:50 2017 +0200 make_unicode: Update data tables to Unicode 10.0.0. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 214 ++++++++++++++++--------------- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 308 ++++++++++++++++++++++----------------------- dlls/dwrite/scripts.h | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 86 ++++++------- dlls/usp10/linebreak.c | 214 ++++++++++++++++--------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 116 +++++++++-------- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 2 +- libs/wine/casemap.c | 2 +- libs/wine/wctype.c | 38 +++--- tools/make_unicode | 5 +- 16 files changed, 501 insertions(+), 498 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b736dbe933465562e1225…

1 0

Jens Reyer : make_unicode: Use VerticalOrientation.txt from UCD.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: ebbbe85038a6fcaf8d0f24dd3f66d40af3c8d954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbbe85038a6fcaf8d0f24dd3… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Sat Jul 8 15:45:51 2017 +0200 make_unicode: Use VerticalOrientation.txt from UCD. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/vertical.c | 24 +++++++++++++----------- dlls/wineps.drv/vertical.c | 24 +++++++++++++----------- tools/make_unicode | 5 ++--- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c index 33309f9..0573760 100644 --- a/dlls/gdi32/vertical.c +++ b/dlls/gdi32/vertical.c @@ -1,10 +1,10 @@ /* Unicode Vertical Orientation */ -/* generated from http://www.unicode.org/Public/vertical/revision-15/VerticalOrientation-15.t… */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = +const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -71,23 +71,23 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0480, 0x0490, 0x02d0, 0x04a0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0450, 0x02d0, 0x0280, 0x0280, 0x0470, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x02d0, 0x04c0, 0x02d0, + 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x04c0, 0x04d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x04d0, 0x04e0, 0x02d0, 0x04f0, 0x0500, 0x02d0, 0x0510, 0x02d0, - 0x0520, 0x0530, 0x0540, 0x02d0, 0x0510, 0x02d0, 0x0520, 0x0550, - 0x02d0, 0x02d0, 0x0560, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0570, - 0x0570, 0x0570, 0x0570, 0x0570, 0x0570, 0x0580, 0x02d0, 0x0590, + 0x04e0, 0x04f0, 0x02d0, 0x0500, 0x0510, 0x02d0, 0x0520, 0x02d0, + 0x0530, 0x0540, 0x0550, 0x02d0, 0x0520, 0x02d0, 0x0530, 0x0560, + 0x02d0, 0x02d0, 0x0570, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, + 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0580, + 0x0580, 0x0580, 0x0580, 0x0580, 0x0580, 0x0590, 0x02d0, 0x05a0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05a0, 0x05b0, 0x05c0, 0x0280, + 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05b0, 0x05c0, 0x05d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x05d0, 0x05e0, 0x02d0, 0x05f0, 0x02d0, 0x0600, 0x0610, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0620, 0x0630, + 0x05e0, 0x05f0, 0x02d0, 0x0600, 0x02d0, 0x0610, 0x0620, 0x0280, + 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0630, 0x0640, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -161,6 +161,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index 33309f9..0573760 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -1,10 +1,10 @@ /* Unicode Vertical Orientation */ -/* generated from http://www.unicode.org/Public/vertical/revision-15/VerticalOrientation-15.t… */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = +const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -71,23 +71,23 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0480, 0x0490, 0x02d0, 0x04a0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0450, 0x02d0, 0x0280, 0x0280, 0x0470, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x02d0, 0x04c0, 0x02d0, + 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x04c0, 0x04d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x04d0, 0x04e0, 0x02d0, 0x04f0, 0x0500, 0x02d0, 0x0510, 0x02d0, - 0x0520, 0x0530, 0x0540, 0x02d0, 0x0510, 0x02d0, 0x0520, 0x0550, - 0x02d0, 0x02d0, 0x0560, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0570, - 0x0570, 0x0570, 0x0570, 0x0570, 0x0570, 0x0580, 0x02d0, 0x0590, + 0x04e0, 0x04f0, 0x02d0, 0x0500, 0x0510, 0x02d0, 0x0520, 0x02d0, + 0x0530, 0x0540, 0x0550, 0x02d0, 0x0520, 0x02d0, 0x0530, 0x0560, + 0x02d0, 0x02d0, 0x0570, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, + 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0580, + 0x0580, 0x0580, 0x0580, 0x0580, 0x0580, 0x0590, 0x02d0, 0x05a0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05a0, 0x05b0, 0x05c0, 0x0280, + 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05b0, 0x05c0, 0x05d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x05d0, 0x05e0, 0x02d0, 0x05f0, 0x02d0, 0x0600, 0x0610, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0620, 0x0630, + 0x05e0, 0x05f0, 0x02d0, 0x0600, 0x02d0, 0x0610, 0x0620, 0x0280, + 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0630, 0x0640, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -161,6 +161,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, diff --git a/tools/make_unicode b/tools/make_unicode index 059c751..92b0b64 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,7 +26,6 @@ my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; my $UNIDATA = "http://www.unicode.org/Public/10.0.0/ucd"; my $REPORTS = "http://www.unicode.org/reports"; my $RFCS = "http://www.rfc-editor.org/rfc"; -my $VERTICALDATA = "http://www.unicode.org/Public/vertical/revision-15"; # Sort keys file my $SORTKEYS = "tr10/allkeys.txt"; @@ -1673,7 +1672,7 @@ sub dump_vertical($) my $filename = shift; my @vertical_table; - my $INPUT = open_data_file( $VERTICALDATA, "VerticalOrientation-15.txt" ); + my $INPUT = open_data_file( $UNIDATA, "VerticalOrientation.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1706,7 +1705,7 @@ sub dump_vertical($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; print OUTPUT "/* Unicode Vertical Orientation */\n"; - print OUTPUT "/* generated from $VERTICALDATA/VerticalOrientation-15.txt */\n"; + print OUTPUT "/* generated from $UNIDATA/VerticalOrientation.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n";

1 0

Jactry Zeng : powershell: Add a stub program.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 54dc788b114250717e83947c3fd391bfd4ee87d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54dc788b114250717e83947c3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jun 28 15:45:30 2017 +0800 powershell: Add a stub program. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/powershell/Makefile.in | 5 +++++ programs/powershell/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index 95cfa25..f334749 100755 --- a/configure +++ b/configure @@ -1599,6 +1599,7 @@ enable_notepad enable_oleview enable_ping enable_plugplay +enable_powershell enable_presentationfontcache enable_progman enable_reg @@ -18868,6 +18869,7 @@ wine_fn_config_program notepad enable_notepad clean,install,installbin,manpage wine_fn_config_program oleview enable_oleview clean,install wine_fn_config_program ping enable_ping install wine_fn_config_program plugplay enable_plugplay install +wine_fn_config_program powershell enable_powershell install wine_fn_config_program presentationfontcache enable_presentationfontcache install wine_fn_config_program progman enable_progman clean,install wine_fn_config_program reg enable_reg clean,install diff --git a/configure.ac b/configure.ac index 77b04b9..bae5ba0 100644 --- a/configure.ac +++ b/configure.ac @@ -3693,6 +3693,7 @@ WINE_CONFIG_PROGRAM(notepad,,[clean,install,installbin,manpage]) WINE_CONFIG_PROGRAM(oleview,,[clean,install]) WINE_CONFIG_PROGRAM(ping,,[install]) WINE_CONFIG_PROGRAM(plugplay,,[install]) +WINE_CONFIG_PROGRAM(powershell,,[install]) WINE_CONFIG_PROGRAM(presentationfontcache,,[install]) WINE_CONFIG_PROGRAM(progman,,[clean,install]) WINE_CONFIG_PROGRAM(reg,,[clean,install]) diff --git a/programs/powershell/Makefile.in b/programs/powershell/Makefile.in new file mode 100644 index 0000000..8a8c319 --- /dev/null +++ b/programs/powershell/Makefile.in @@ -0,0 +1,5 @@ +MODULE = powershell.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/powershell/main.c b/programs/powershell/main.c new file mode 100644 index 0000000..d39cdc0 --- /dev/null +++ b/programs/powershell/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2017 Jactry Zeng 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(powershell); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Austin English : ntoskrnl.exe: Add IoCreateNotificationEvent stub.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: b3a698e501832a072d358f7f2185e08830ad990f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a698e501832a072d358f7f2… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 6 15:41:08 2017 -0500 ntoskrnl.exe: Add IoCreateNotificationEvent stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 105bb7d..8d2c020 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3255,7 +3255,16 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) /*********************************************************************** * KeReleaseSpinLock (NTOSKRNL.EXE.@) */ -VOID WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) +void WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) { FIXME( "stub: %p %u\n", spinlock, irql ); } + +/*********************************************************************** + * IoCreateNotificationEvent (NTOSKRNL.EXE.@) + */ +PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) +{ + FIXME( "stub: %s %p\n", debugstr_us(name), handle ); + return NULL; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 339e7c5..ae2f335 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -343,7 +343,7 @@ @ stdcall IoCreateDriver(ptr ptr) @ stdcall IoCreateFile(ptr long ptr ptr ptr long long long long ptr long long ptr long) @ stub IoCreateFileSpecifyDeviceObjectHint -@ stub IoCreateNotificationEvent +@ stdcall IoCreateNotificationEvent(ptr ptr) @ stub IoCreateStreamFileObject @ stub IoCreateStreamFileObjectEx @ stub IoCreateStreamFileObjectLite

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: a4f5b240e78d5fbc73179ca5ec1b75f6fbc84309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f5b240e78d5fbc73179ca5e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Jul 13 09:11:21 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 55 +++++++------------------------------------------------ 1 file changed, 7 insertions(+), 48 deletions(-) diff --git a/po/lt.po b/po/lt.po index d6d3fbd..bc66381 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-11 12:11+0300\n" +"PO-Revision-Date: 2017-07-13 09:10+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12380,38 +12380,6 @@ msgstr "" "Nepavyko importuoti %1. Nurodytas failas nėra teisingas registro failas." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12466,7 +12434,7 @@ msgstr "" "Naudojimo pavyzdžiai:\n" " regedit \"importui.reg\"\n" " regedit /E \"eksportuota.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Raktas\\Kelias\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12537,11 +12505,10 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit: Nepalaikomas registro duomenų tipas [%1] sutiktas „%2“.\n" +msgstr "" +"regedit: Nepalaikomas registro duomenų tipas [0x%1!x!] sutiktas „%2“.\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -12549,10 +12516,8 @@ msgstr "" "regedit: Registro reikšmė „%1“ bus eksportuota kaip dvejetainiai duomenys.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "regedit: Netinkamas sisteminis raktas [%1]\n" #: regedit.rc:428 msgid "" @@ -12561,10 +12526,8 @@ msgstr "" "regedit: Nepavyko eksportuoti „%1“. Nurodytas registro raktas nerastas.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: Nepavyko pašalinti registro klasės „%1“.\n" +msgstr "regedit: Nepavyko pašalinti registro rakto „%1“.\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12711,13 +12674,9 @@ msgid "Confirm Key Delete" msgstr "Rakto šalinimo patvirtinimas" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Ar tikrai norite pašalinti registro raktą „%1“ ir visus jo porakčius?" +msgstr "Ar tikrai norite pašalinti šį registro raktą ir visus jo porakčius?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0