November 2017 - Wine-commits

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

15 Nov '17

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: Use raw blits in wined3d_device_copy_sub_resource_region().
by Alexandre Julliard 15 Nov '17

15 Nov '17

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

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

15 Nov '17

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

Józef Kucia : wined3d: Allow copies between compatible formats in wined3d_device_copy_sub_resource_region ().
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: 7374c8325dcfc0e70b3032cdf5702f5d50833271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7374c8325dcfc0e70b3032cdf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 16 01:01:04 2017 +0330 wined3d: Allow copies between compatible formats 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 | 13 +++++++++++++ dlls/wined3d/device.c | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 50bba6b..3b0b483 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1393,6 +1393,7 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); + struct wined3d_sub_resource_desc src_desc, dst_desc; struct wined3d_box src_box; HRESULT hr; @@ -1403,6 +1404,18 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, 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); + wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc); + if (src_desc.format != dst_desc.format) + { + wined3d_mutex_unlock(); + WARN("Surface formats (%#x/%#x) don't match.\n", + d3dformat_from_wined3dformat(src_desc.format), + d3dformat_from_wined3dformat(dst_desc.format)); + return D3DERR_INVALIDCALL; + } + 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), diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1995a50..9fbf3b0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4100,9 +4100,10 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - 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 WINED3DERR_INVALIDCALL;

1 0

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

15 Nov '17

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

Piotr Caban : msvcrt: Fix IO initialization when invalid handles are passed.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: 31bf13e92b1c6a7092a44240b763605ae315c328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bf13e92b1c6a7092a44240b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 15 09:47:23 2017 +0100 msvcrt: Fix IO initialization when invalid handles are passed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 42 +++++++++++++++++++++++++----- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/file.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b22cbeb..2516570 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -581,30 +581,57 @@ void msvcrt_init_io(void) fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_INPUT_HANDLE); + DWORD flags = WX_OPEN | WX_TEXT; DWORD type = GetFileType(h); - msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); + if (type == FILE_TYPE_UNKNOWN) { + h = MSVCRT_NO_CONSOLE; + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_CHAR) { + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_PIPE) { + flags |= WX_PIPE; + } + + msvcrt_set_fd(fdinfo, h, flags); } release_ioinfo(fdinfo); fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); + DWORD flags = WX_OPEN | WX_TEXT; DWORD type = GetFileType(h); - msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); + if (type == FILE_TYPE_UNKNOWN) { + h = MSVCRT_NO_CONSOLE; + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_CHAR) { + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_PIPE) { + flags |= WX_PIPE; + } + + msvcrt_set_fd(fdinfo, h, flags); } release_ioinfo(fdinfo); fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_ERROR_HANDLE); + DWORD flags = WX_OPEN | WX_TEXT; DWORD type = GetFileType(h); - msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); + if (type == FILE_TYPE_UNKNOWN) { + h = MSVCRT_NO_CONSOLE; + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_CHAR) { + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_PIPE) { + flags |= WX_PIPE; + } + + msvcrt_set_fd(fdinfo, h, flags); } release_ioinfo(fdinfo); @@ -616,7 +643,8 @@ void msvcrt_init_io(void) for (i = 0; i < 3; i++) { /* FILE structs for stdin/out/err are static and never deleted */ - MSVCRT__iob[i]._file = i; + MSVCRT__iob[i]._file = get_ioinfo_nolock(i)->handle == MSVCRT_NO_CONSOLE ? + MSVCRT_NO_CONSOLE_FD : i; MSVCRT__iob[i]._tmpfname = NULL; MSVCRT__iob[i]._flag = (i == 0) ? MSVCRT__IOREAD : MSVCRT__IOWRT; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1b117c8..a380613 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -742,6 +742,9 @@ struct MSVCRT__stat64 { #define MSVCRT_SEEK_CUR 1 #define MSVCRT_SEEK_END 2 +#define MSVCRT_NO_CONSOLE_FD (-2) +#define MSVCRT_NO_CONSOLE ((HANDLE)MSVCRT_NO_CONSOLE_FD) + #define MSVCRT_STDIN_FILENO 0 #define MSVCRT_STDOUT_FILENO 1 #define MSVCRT_STDERR_FILENO 2 diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 2db553d..0867ac0 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = msvcrt.dll APPMODE = -mno-cygwin EXTRAINCL = -I$(srcdir)/.. +IMPORTS = advapi32 C_SRCS = \ cpp.c \ diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d92a6e4..e0b94cf 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -31,6 +31,7 @@ #include <windef.h> #include <winbase.h> #include <winnls.h> +#include <winreg.h> #include <process.h> #include <errno.h> #include <locale.h> @@ -1522,6 +1523,61 @@ static void test_file_inherit( const char* selfname ) DeleteFileA("fdopen.tst"); } +static void test_invalid_stdin_child( void ) +{ + HANDLE handle; + ioinfo *info; + + errno = 0xdeadbeef; + handle = (HANDLE)_get_osfhandle(STDIN_FILENO); + ok(handle == (HANDLE)-2, "handle = %p\n", handle); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + info = &__pioinfo[STDIN_FILENO/MSVCRT_FD_BLOCK_SIZE][STDIN_FILENO%MSVCRT_FD_BLOCK_SIZE]; + ok(info->handle == (HANDLE)-2, "info->handle = %p\n", info->handle); + ok(info->wxflag == 0xc1, "info->wxflag = %x\n", info->wxflag); + + ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file); +} + +static void test_invalid_stdin( const char* selfname ) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION proc; + SECURITY_ATTRIBUTES sa; + STARTUPINFOA startup; + HKEY key; + LONG ret; + + if(!p_fopen_s) { + /* Behaviour of the dll has changed in newer version */ + win_skip("skipping invalid stdin tests\n"); + return; + } + + ret = RegOpenCurrentUser(KEY_READ, &key); + ok(!ret, "RegOpenCurrentUser failed: %x\n", ret); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESTDHANDLES; + startup.hStdInput = key; + startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + startup.hStdError = GetStdHandle(STD_ERROR_HANDLE); + + sprintf(cmdline, "%s file stdin", selfname); + CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, + CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); + + ret = RegCloseKey(key); + ok(!ret, "RegCloseKey failed: %x\n", ret); +} + static void test_tmpnam( void ) { char name[MAX_PATH] = "abc"; @@ -2461,12 +2517,15 @@ START_TEST(file) test_file_inherit_child_no(arg_v[3]); else if (strcmp(arg_v[2], "pipes") == 0) test_pipes_child(arg_c, arg_v); + else if (strcmp(arg_v[2], "stdin") == 0) + test_invalid_stdin_child(); else ok(0, "invalid argument '%s'\n", arg_v[2]); return; } test_dup2(); test_file_inherit(arg_v[0]); + test_invalid_stdin(arg_v[0]); test_file_write_read(); test_chsize(); test_stat();

1 0

Piotr Caban : msvcrt: Fix close() behaviour on "no console" file descriptors.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: 677301a29cffa9474fcad4c284661171092510d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=677301a29cffa9474fcad4c28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 15 09:47:29 2017 +0100 msvcrt: Fix close() 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 | 6 +++++- dlls/msvcrt/tests/file.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2516570..422e95d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1047,7 +1047,11 @@ int CDECL MSVCRT__close(int fd) int ret; TRACE(":fd (%d) handle (%p)\n", fd, info->handle); - if (!(info->wxflag & WX_OPEN)) { + + if (fd == MSVCRT_NO_CONSOLE_FD) { + *MSVCRT__errno() = MSVCRT_EBADF; + ret = -1; + } else if (!(info->wxflag & WX_OPEN)) { ret = -1; } else if (fd == MSVCRT_STDOUT_FILENO && info->handle == get_ioinfo_nolock(MSVCRT_STDERR_FILENO)->handle) { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index e0b94cf..543eb3f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1527,6 +1527,7 @@ static void test_invalid_stdin_child( void ) { HANDLE handle; ioinfo *info; + int ret; errno = 0xdeadbeef; handle = (HANDLE)_get_osfhandle(STDIN_FILENO); @@ -1538,6 +1539,21 @@ static void test_invalid_stdin_child( void ) ok(info->wxflag == 0xc1, "info->wxflag = %x\n", info->wxflag); ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file); + + errno = 0xdeadbeef; + ret = fclose(stdin); + ok(ret == -1, "fclose(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = close(-2); + ok(ret == -1, "close(-2) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = close(STDIN_FILENO); + ok(ret==-1 || !ret, "close(STDIN_FILENO) returned %d\n", ret); + ok((ret==-1 && errno==EBADF) || (!ret && errno==0xdeadbeef), "errno = %d\n", errno); } static void test_invalid_stdin( const char* selfname )

1 0

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

15 Nov '17

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

Piotr Caban : msvcrt: Fix write() behaviour on "no console" file descriptors.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: 7aa4b6d17023061feff50ca33c440b9590511e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa4b6d17023061feff50ca33… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 15 09:47:37 2017 +0100 msvcrt: Fix write() 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 | 11 ++++++----- dlls/msvcrt/tests/file.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7fcba06..5eaee2b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3423,7 +3423,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) if (count > 32) TRACE(":fd (%d) handle (%d) buf (%p) len (%d)\n",fd,hand,buf,count); #endif - if (hand == INVALID_HANDLE_VALUE) + if (hand == INVALID_HANDLE_VALUE || fd == MSVCRT_NO_CONSOLE_FD) { *MSVCRT__errno() = MSVCRT_EBADF; release_ioinfo(info); @@ -3451,14 +3451,14 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) } TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, hand, GetLastError()); - *MSVCRT__errno() = MSVCRT_ENOSPC; + msvcrt_set_errno(GetLastError()); } else { unsigned int i, j, nr_lf, size; char *p = NULL; const char *q; - const char *s = buf, *buf_start = buf; + const char *s = buf; if (!(info->exflag & (EF_UTF8|EF_UTF16))) { @@ -3577,8 +3577,8 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) { TRACE("WriteFile (fd %d, hand %p) failed-last error (%d), num_written %d\n", fd, hand, GetLastError(), num_written); - *MSVCRT__errno() = MSVCRT_ENOSPC; - return s - buf_start; + msvcrt_set_errno(GetLastError()); + return -1; } return count; } @@ -3927,6 +3927,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(!(file->_flag & MSVCRT__IOWRT)) { if(!(file->_flag & MSVCRT__IORW)) { file->_flag |= MSVCRT__IOERR; + *MSVCRT__errno() = MSVCRT_EBADF; return MSVCRT_EOF; } file->_flag |= MSVCRT__IOWRT; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index f118ef3..99ceb97 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1557,6 +1557,26 @@ static void test_invalid_stdin_child( void ) ok(errno == EBADF, "errno = %d\n", errno); errno = 0xdeadbeef; + ret = _flsbuf('a', stdin); + ok(ret == EOF, "_flsbuf(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = fwrite(&c, 1, 1, stdin); + ok(!ret, "fwrite(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = write(-2, &c, 1); + ok(ret == -1, "write(-2) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = write(STDIN_FILENO, &c, 1); + ok(ret == -1, "write(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

Rafał Harabień : riched20: Protect against pasting multi-line text in single-line control.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: 585dfa1409ece5bfe626a9b290a3854ad7aa7aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=585dfa1409ece5bfe626a9b29… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Wed Nov 15 02:18:53 2017 +0100 riched20: Protect against pasting multi-line text in single-line control. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 +++ dlls/riched20/editor.c | 18 ++--------- dlls/riched20/tests/editor.c | 72 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 26af743..8a99394 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -551,6 +551,10 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_DisplayItem *tp, *end_run, *run, *prev; int eol_len = 0; + /* Check if new line is allowed for this control */ + if (!(editor->styleFlags & ES_MULTILINE)) + break; + /* Find number of CR and LF in end of paragraph run */ if (*pos =='\r') { diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 88e3d8e..daafe80 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -176,7 +176,7 @@ + ES_DISABLENOSCROLL (scrollbar is always visible) - ES_EX_NOCALLOLEINIT + ES_LEFT - - ES_MULTILINE (currently single line controls aren't supported) + + ES_MULTILINE - ES_NOIME - ES_READONLY (I'm not sure if beeping is the proper behaviour) + ES_RIGHT @@ -3421,21 +3421,7 @@ static void ME_SetText(ME_TextEditor *editor, void *text, BOOL unicode) int textLen; LPWSTR wszText = ME_ToUnicode(codepage, text, &textLen); - - if (textLen > 0) - { - int len = -1; - - /* uses default style! */ - if (!(editor->styleFlags & ES_MULTILINE)) - { - WCHAR *p = wszText; - - while (*p != '\0' && *p != '\r' && *p != '\n') p++; - len = p - wszText; - } - ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); - } + ME_InsertTextFromCursor(editor, 0, wszText, textLen, editor->pBuffer->pDefaultStyle); ME_EndToUnicode(codepage, wszText); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a19ec85..9bfbf45 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -70,6 +70,10 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS20A, ES_MULTILINE, parent); } +static HWND new_richedit_with_style(HWND parent, DWORD style) { + return new_window(RICHEDIT_CLASS20A, style, parent); +} + static HWND new_richeditW(HWND parent) { return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); } @@ -3748,6 +3752,20 @@ static void test_WM_SETTEXT(void) TEST_SETTEXTW(urtftextW, urtftextW) /* interpreted as ascii text */ DestroyWindow(hwndRichEdit); #undef TEST_SETTEXTW + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"line1\r\nline2"); + ok(result == 1, "WM_SETTEXT returned %ld, expected 12\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok(result == 5, "WM_GETTEXT returned %ld, expected 5\n", result); + ok(!strcmp(buf, "line1"), "WM_GETTEXT returned incorrect string '%s'\n", buf); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"); + ok(result == 1, "WM_SETTEXT returned %ld, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok(result == 3, "WM_GETTEXT returned %ld, expected 3\n", result); + ok(!strcmp(buf, "ABC"), "WM_GETTEXT returned incorrect string '%s'\n", buf); + DestroyWindow(hwndRichEdit); } /* Set *pcb to one to show that the remaining cb-1 bytes are not @@ -4406,6 +4424,17 @@ static void test_EM_SETTEXTEX(void) } DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + setText.flags = ST_DEFAULT; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"line1\r\nline2"); + ok(result == 1, "EM_SETTEXTEX incorrectly returned %d, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "line1"), "EM_SETTEXTEX: Test single-line text: Result: %s\n", bufACP); + DestroyWindow(hwndRichEdit); } static void test_EM_LIMITTEXT(void) @@ -5351,6 +5380,15 @@ static void test_EM_REPLACESEL(int redraw) SendMessageA(hwndRichEdit, WM_SETREDRAW, TRUE, 0); DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"line1\r\nline2"); + ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + ok(!strcmp(buffer, "line1"), "WM_GETTEXT returned incorrect string '%s'\n", buffer); + DestroyWindow(hwndRichEdit); } /* Native riched20 inspects the keyboard state (e.g. GetKeyState) @@ -5498,21 +5536,39 @@ static void test_WM_PASTE(void) "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); + /* Copy multiline text to clipboard for future use */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 0); + /* Paste into read-only control */ result = SendMessageA(hwndRichEdit, EM_SETREADONLY, TRUE, 0); SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"cut\r\n"); + result = strcmp(buffer, text3); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); /* Cut from read-only control */ SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); SendMessageA(hwndRichEdit, WM_CUT, 0, 0); - result = strcmp(buffer,"cut\r\n"); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, text3); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + /* FIXME: Wine doesn't flush Ole clipboard when window is destroyed so do it manually */ + OleFlushClipboard(); + DestroyWindow(hwndRichEdit); + + /* Paste multi-line text into single-line control */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, "testing paste"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); DestroyWindow(hwndRichEdit); } @@ -5973,6 +6029,18 @@ static void test_EM_STREAMIN(void) ok(es.dwError == 0, "EM_STREAMIN: Test 5 set error %d, expected %d\n", es.dwError, 0); DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + ptr = "line1\r\nline2"; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == 12, "got %ld, expected %d\n", result, 12); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (!strcmp(buffer, "line1"), + "EM_STREAMIN: Unexpected text '%s'\n", buffer); } static void test_EM_StreamIn_Undo(void)

1 0