November 2017 - Wine-Commits

Henri Verbeet : wined3d: Use raw blits in wined3d_device_copy_sub_resource_region().
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: e196ecd940b9f8b28a9c84175c5f07b9679a2201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e196ecd940b9f8b28a9c84175… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 01:01:02 2017 +0330 wined3d: Use raw blits in wined3d_device_copy_sub_resource_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d19f279..342905c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4202,7 +4202,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, dst_sub_resource_idx, &dst_box, - src_resource, src_sub_resource_idx, src_box, 0, NULL, WINED3D_TEXF_POINT); + src_resource, src_sub_resource_idx, src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Add format class information for WINED3DFMT_R8G8B8A8_SNORM.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: f695a7c3f90fec67d93498c5b6874a839c2125a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f695a7c3f90fec67d93498c5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 01:01:06 2017 +0330 wined3d: Add format class information for WINED3DFMT_R8G8B8A8_SNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0e00203..5eda92a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -232,6 +232,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, "UUUU"}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, "IIII"}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "iiii"}, {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_TYPELESS, "uuuu"}, {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "uuuu"}, {WINED3DFMT_R16G16_UNORM, WINED3DFMT_R16G16_TYPELESS, "uu"},

1 0

Józef Kucia : wined3d: Allow copies between compatible formats in wined3d_device_copy_resource() .
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 61658f445b33da374d81c52ab81e2f4f81c378c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61658f445b33da374d81c52ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 16 01:01:03 2017 +0330 wined3d: Allow copies between compatible formats in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 342905c..1995a50 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4029,9 +4029,10 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (src_resource->format->id != dst_resource->format->id) + if (src_resource->format->typeless_id != dst_resource->format->typeless_id + || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) { - WARN("Resource formats (%s / %s) don't match.\n", + WARN("Resource formats %s and %s are incompatible.\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id)); return;

1 0

Henri Verbeet : wined3d: Use raw blits in wined3d_device_copy_resource().
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: ac689f0ac9376f06fea6cbcee40bc46c32b71885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac689f0ac9376f06fea6cbcee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 01:01:01 2017 +0330 wined3d: Use raw blits in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 8 +++++--- include/wine/wined3d.h | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 104e4c4..f7c943e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2045,14 +2045,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * struct wined3d_context *context; struct wined3d_bo_address addr; - if (op->flags) + if (op->flags & ~WINED3D_BLT_RAW) { FIXME("Flags %#x not implemented for %s resources.\n", op->flags, debug_d3dresourcetype(op->dst_resource->type)); goto error; } - if (op->src_resource->format != op->dst_resource->format) + if (!(op->flags & WINED3D_BLT_RAW) && op->src_resource->format != op->dst_resource->format) { FIXME("Format conversion not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3963105..d19f279 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4041,7 +4041,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, { wined3d_box_set(&box, 0, 0, src_resource->size, 1, 0, 1); wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &box, - src_resource, 0, &box, 0, NULL, WINED3D_TEXF_POINT); + src_resource, 0, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return; } @@ -4068,7 +4068,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, unsigned int idx = j * dst_texture->level_count + i; wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &box, - src_resource, idx, &box, 0, NULL, WINED3D_TEXF_POINT); + src_resource, idx, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); } } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 379fa6a..02e0c70 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3073,7 +3073,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int same_sub_resource = FALSE; dst_format = dst_texture->resource.format; dst_fmt_flags = dst_texture->resource.format_flags; - if (dst_texture->resource.format->id != src_texture->resource.format->id) + if (!(flags & WINED3D_BLT_RAW) && dst_texture->resource.format->id != src_texture->resource.format->id) { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) { @@ -3108,6 +3108,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int dst_map.data = context_map_bo_address(context, &dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, 0); } + flags &= ~WINED3D_BLT_RAW; bpp = dst_format->byte_count; src_height = src_box->bottom - src_box->top; @@ -3737,7 +3738,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE - | WINED3D_BLT_ALPHA_TEST; + | WINED3D_BLT_ALPHA_TEST + | WINED3D_BLT_RAW; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), @@ -3908,7 +3910,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINED3D_OK; } - else if (!scale && !convert) + else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert)) { blit_op = WINED3D_BLIT_OP_RAW_BLIT; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 131bbf4..f35d980 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1342,6 +1342,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_BLT_SRC_CKEY_OVERRIDE 0x00010000 #define WINED3D_BLT_WAIT 0x01000000 #define WINED3D_BLT_DO_NOT_WAIT 0x08000000 +#define WINED3D_BLT_RAW 0x20000000 #define WINED3D_BLT_SYNCHRONOUS 0x40000000 #define WINED3D_BLT_ALPHA_TEST 0x80000000 #define WINED3D_BLT_MASK 0x0901e800

1 0

Henri Verbeet : wined3d: Clamp NULL source boxes in wined3d_device_copy_sub_resource_region().
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 7b09398a0b27fe0efcd41f103526768348f61723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b09398a0b27fe0efcd41f103… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 01:01:05 2017 +0330 wined3d: Clamp NULL source boxes in wined3d_device_copy_sub_resource_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 10 ++++++---- dlls/wined3d/device.c | 17 ++++++++++++++--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3b0b483..f6086bf 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1400,9 +1400,6 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", iface, src_surface, src_rect, dst_surface, dst_point); - if (src_rect) - wined3d_box_set(&src_box, src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1); - wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc); @@ -1416,10 +1413,15 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + if (src_rect) + wined3d_box_set(&src_box, src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1); + else + wined3d_box_set(&src_box, 0, 0, src_desc.width, src_desc.height, 0, 1); + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), - src->sub_resource_idx, src_rect ? &src_box : NULL); + src->sub_resource_idx, &src_box); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9fbf3b0..de6f1c5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4125,7 +4125,10 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (!src_box) { - wined3d_box_set(&b, 0, 0, src_resource->size, 1, 0, 1); + unsigned int dst_w; + + dst_w = dst_resource->size - dst_x; + wined3d_box_set(&b, 0, 0, min(src_resource->size, dst_w), 1, 0, 1); src_box = &b; } else if ((src_box->left >= src_box->right @@ -4178,8 +4181,16 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (!src_box) { - wined3d_box_set(&b, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), - wined3d_texture_get_level_height(src_texture, src_level), 0, 1); + unsigned int src_w, src_h, dst_w, dst_h, dst_level; + + src_w = wined3d_texture_get_level_width(src_texture, src_level); + src_h = wined3d_texture_get_level_height(src_texture, src_level); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + dst_w = wined3d_texture_get_level_width(dst_texture, dst_level) - dst_x; + dst_h = wined3d_texture_get_level_height(dst_texture, dst_level) - dst_y; + + wined3d_box_set(&b, 0, 0, min(src_w, dst_w), min(src_h, dst_h), 0, 1); src_box = &b; } else if (FAILED(wined3d_texture_check_box_dimensions(src_texture, src_level, src_box)))

1 0

Henri Verbeet : wined3d: Introduce a blitter based on ARB_copy_image.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 786ebbdec3081aebba451ef100b41ee6768bcbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=786ebbdec3081aebba451ef10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 01:01:00 2017 +0330 wined3d: Introduce a blitter based on ARB_copy_image. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 8 ++ dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 4 + dlls/wined3d/surface.c | 164 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 3 + 6 files changed, 176 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=786ebbdec3081aebba451…

1 0

Piotr Caban : msvcrt: Fix read() behaviour on "no console" file descriptors.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 9b2397d5c87969ce2a3c8dd24e2491b53ee018b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2397d5c87969ce2a3c8dd24… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 15 09:47:33 2017 +0100 msvcrt: Fix read() behaviour on "no console" file descriptors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 20 ++++++++++++++++---- dlls/msvcrt/tests/file.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 422e95d..7fcba06 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2892,6 +2892,7 @@ static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count) else { TRACE(":failed-last error (%d)\n",GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } } @@ -2906,8 +2907,16 @@ static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count) */ int CDECL MSVCRT__read(int fd, void *buf, unsigned int count) { - ioinfo *info = get_ioinfo(fd); - int num_read = read_i(fd, info, buf, count); + ioinfo *info; + int num_read; + + if(fd == MSVCRT_NO_CONSOLE_FD) { + *MSVCRT__errno() = MSVCRT_EBADF; + return -1; + } + + info = get_ioinfo(fd); + num_read = read_i(fd, info, buf, count); release_ioinfo(info); return num_read; } @@ -4291,9 +4300,12 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock(void *ptr, MSVCRT_size_t size, MSVCRT_s { int i; if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && (file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { - file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); + i = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; - i = (file->_cnt<rcnt) ? file->_cnt : rcnt; + if (i != -1) { + file->_cnt = i; + if (i > rcnt) i = rcnt; + } /* If the buffer fill reaches eof but fread wouldn't, clear eof. */ if (i > 0 && i < file->_cnt) { get_ioinfo_nolock(file->_file)->wxflag &= ~WX_ATEOF; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 543eb3f..f118ef3 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1528,6 +1528,7 @@ static void test_invalid_stdin_child( void ) HANDLE handle; ioinfo *info; int ret; + char c; errno = 0xdeadbeef; handle = (HANDLE)_get_osfhandle(STDIN_FILENO); @@ -1541,6 +1542,21 @@ static void test_invalid_stdin_child( void ) ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file); errno = 0xdeadbeef; + ret = fread(&c, 1, 1, stdin); + ok(!ret, "fread(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = read(-2, &c, 1); + ok(ret == -1, "read(-2) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = read(STDIN_FILENO, &c, 1); + ok(ret == -1, "read(STDIN_FILENO) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; ret = fclose(stdin); ok(ret == -1, "fclose(stdin) returned %d\n", ret); ok(errno == EBADF, "errno = %d\n", errno);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 2d49ba4f29a0f146099d98b356e7ce7335262cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d49ba4f29a0f146099d98b35… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Nov 15 21:44:33 2017 +0200 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 | 54 ++++++++++++------------------------------------------ 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/po/lt.po b/po/lt.po index e7dd526..2a51195 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-11-14 22:09+0300\n" +"PO-Revision-Date: 2017-11-15 21:43+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" @@ -10594,6 +10594,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Sukurti simbolinę nuorodą.\n" +"\n" +"Sintaksė: MKLINK [parametrai] nuorodos_vardas paskirtis\n" +"\n" +"Parametrai:\n" +"/d Sukurti katalogo simbolinę nuorodą.\n" +"/h Sukurti nuorodą.\n" +"/j Sukurti katalogo jungtį.\n" +"nuorodos_vardas yra naujos simbolinės nuorodos vardas.\n" +"paskirtis yra kelias į kurį rodo nuorodos_vardas.\n" #: cmd.rc:312 msgid "" @@ -10604,47 +10614,6 @@ msgstr "" "apvalkalą iš kur CMD iškviestas.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10703,6 +10672,7 @@ msgstr "" "FTYPE\t\tRodyti ar modifikuoti atvėrimo komandas susietas su failų tipais\n" "HELP\t\tParodyti trumpą pagalbą apie temą\n" "MD (MKDIR)\tSukurti pakatalogį\n" +"MKLINK\t\tSukurti simbolinę nuorodą\n" "MORE\t\tRodyti išvedimą puslapiais\n" "MOVE\t\tPerkelti failą, failų rinkinį ar katalogų medį\n" "PATH\t\tNustatyti ar parodyti paieškos kelią\n"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: f2c49c0490c24cb63beb56f838b14535290c8c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c49c0490c24cb63beb56f83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 15 17:26:32 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 58 ++++++++++++++-------------------------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1f8bb23..7d35265 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ 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-08-21 15:10+0300\n" +"PO-Revision-Date: 2017-11-15 17:25+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.3\n" +"X-Generator: Poedit 2.0.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -10589,6 +10589,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Создаёт символическую ссылку.\n" +"\n" +"Синтаксис: MKLINK [опции] имя_ссылки цель\n" +"\n" +"Опции:\n" +"/d Создать ссылку на директорию.\n" +"/h Создать жёсткую ссылку.\n" +"/j Создать точку соединения директорий.\n" +"Имя новой ссылки задаётся с помощью «имя_ссылки».\n" +"Созданная ссылка указывает на путь «цель».\n" #: cmd.rc:312 msgid "" @@ -10599,47 +10609,6 @@ msgstr "" "или оболочку из которой был запущен cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10698,6 +10667,7 @@ msgstr "" "FTYPE\t\tВыводит или изменяет команды открытия, связанные с типами файлов\n" "HELP\t\tПоказывает краткую подсказку по команде\n" "MD (MKDIR)\tСоздаёт каталог\n" +"MKLINK\tСоздаёт символическую ссылку\n" "MORE\t\tВыводит данные по страницам\n" "MOVE\t\tПеремещает файл, несколько файлов или дерево каталогов\n" "PATH\t\tПоказывает или изменяет путь поиска программ\n" @@ -14986,7 +14956,7 @@ msgstr "Число мин" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Все результаты будут утеряны. Вы уверены?" #: winemine.rc:30 msgid "WineMine"

1 0

Dmitry Timoshkov : widl: Generate header macros even for aggregate return methods.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: b63274f30fcf5bc654b331d840486d6de5156a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63274f30fcf5bc654b331d84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 14 10:29:38 2017 +0800 widl: Generate header macros even for aggregate return methods. A generated macro has a clear suggestion what to do (#define WIDL_C_INLINE_WRAPPERS) instead of completely omitting the macro and leaving one wondering what is going on. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b5fe232..9f92127 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -960,7 +960,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * if (is_override_method(iface, child, func)) continue; - if (!is_callas(func->attrs) && !is_aggregate_return(func)) { + if (!is_callas(func->attrs)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -969,6 +969,12 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * fprintf(header, ",%s", arg->name); fprintf(header, ") "); + if (is_aggregate_return(func)) + { + fprintf(header, "%s_%s_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support\n", name, get_name(func)); + continue; + } + fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry )

1 0