wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Biswapriyo Nath : include/d3d10sdklayers.idl: Add D3D10Debug interface.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: e9ec3560d4604f7e7d282b9a5cdbdec4b7880583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ec3560d4604f7e7d282b9a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 26 00:11:57 2020 +0530 include/d3d10sdklayers.idl: Add D3D10Debug interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d10sdklayers.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d3d10sdklayers.idl b/include/d3d10sdklayers.idl index c6606d2fd6..b5b0d031ae 100644 --- a/include/d3d10sdklayers.idl +++ b/include/d3d10sdklayers.idl @@ -24,6 +24,10 @@ cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetMessage") cpp_quote("#endif") +const UINT D3D10_DEBUG_FEATURE_FLUSH_PER_RENDER_OP = 0x1; +const UINT D3D10_DEBUG_FEATURE_FINISH_PER_RENDER_OP = 0x2; +const UINT D3D10_DEBUG_FEATURE_PRESENT_PER_RENDER_OP = 0x4; + typedef enum D3D10_MESSAGE_CATEGORY { D3D10_MESSAGE_CATEGORY_APPLICATION_DEFINED, @@ -585,6 +589,31 @@ typedef struct D3D10_INFO_QUEUE_FILTER D3D10_INFO_QUEUE_FILTER_DESC DenyList; } D3D10_INFO_QUEUE_FILTER; +[ + local, + object, + uuid(9b7e4e01-342c-4106-a19f-4f2704f689f0), + pointer_default(unique) +] +interface ID3D10Debug : IUnknown +{ + HRESULT SetFeatureMask( + [in] UINT mask + ); + UINT GetFeatureMask(); + HRESULT SetPresentPerRenderOpDelay( + [in] UINT milliseconds + ); + UINT GetPresentPerRenderOpDelay(); + HRESULT SetSwapChain( + [in] IDXGISwapChain *swapchain + ); + HRESULT GetSwapChain( + [out] IDXGISwapChain **swapchain + ); + HRESULT Validate(); +} + [ local, object,

1 0

Shawn M. Chapla : gdiplus: Implement GdipGetClipBoundsI in terms of GdipGetClipBounds.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 52fa4fb74e028f7a3f8c577562b21300cb22a4da URL: https://source.winehq.org/git/wine.git/?a=commit;h=52fa4fb74e028f7a3f8c5775… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Aug 25 18:13:41 2020 -0400 gdiplus: Implement GdipGetClipBoundsI in terms of GdipGetClipBounds. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 16 ++++++++++++---- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c3542b3d65..5db8973c7b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4770,15 +4770,23 @@ GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics *graphics, GpRectF *rect) */ GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics *graphics, GpRect *rect) { + GpRectF rectf; + GpStatus stat; + TRACE("(%p, %p)\n", graphics, rect); - if(!graphics) + if (!rect) return InvalidParameter; - if(graphics->busy) - return ObjectBusy; + if ((stat = GdipGetClipBounds(graphics, &rectf)) == Ok) + { + rect->X = gdip_round(rectf.X); + rect->Y = gdip_round(rectf.Y); + rect->Width = gdip_round(rectf.Width); + rect->Height = gdip_round(rectf.Height); + } - return GdipGetRegionBoundsI(graphics->clip, graphics, rect); + return stat; } GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 38780d4686..1dbb0ae279 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5157,7 +5157,7 @@ static void test_clipping(void) status = GdipGetClipBoundsI(graphics, &recti); expect(Ok, status); - todo_wine ok(recti.X == 45 && recti.Y == 20 && recti.Width == 50 && recti.Height == 25, + ok(recti.X == 45 && recti.Y == 20 && recti.Width == 50 && recti.Height == 25, "expected 45,20-50,25, got %i,%i-%i,%i\n", recti.X, recti.Y, recti.Width, recti.Height); status = GdipSetEmpty(region);

1 0

Shawn M. Chapla : gdiplus/tests: Add cursory GdipGetClipBoundsI checks to graphics clipping test.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 5e40198862ea0ed8a389d7d3ed5fdec0e97689e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e40198862ea0ed8a389d7d3… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Aug 25 18:13:40 2020 -0400 gdiplus/tests: Add cursory GdipGetClipBoundsI checks to graphics clipping test. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d1f0d03ddc..38780d4686 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5071,6 +5071,7 @@ static void test_clipping(void) GpRegion *region, *region100x100; GpMatrix *matrix; GpRectF rect; + GpRect recti; GpPointF ptf[4]; GpUnit unit; HRGN hrgn; @@ -5107,6 +5108,11 @@ static void test_clipping(void) ok(rect.X == 100.0 && rect.Y == 100.0 && rect.Width == 100.0 && rect.Height == 100.0, "expected 100.0,100.0-100.0,100.0, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + status = GdipGetClipBoundsI(graphics, &recti); + expect(Ok, status); + ok(recti.X == 100 && recti.Y == 100 && recti.Width == 100 && recti.Height == 100, + "expected 100,100-100,100, got %i,%i-%i,%i\n", recti.X, recti.Y, recti.Width, recti.Height); + /* Clip region does not account for changes to gdi32 transform */ SetViewportOrgEx(hdc, 10, 10, NULL); @@ -5149,6 +5155,11 @@ static void test_clipping(void) ok(rect.X == 45.0 && rect.Y == 20.0 && rect.Width == 50.0 && rect.Height == 25.0, "expected 45.0,20.0-50.0,25.0, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + status = GdipGetClipBoundsI(graphics, &recti); + expect(Ok, status); + todo_wine ok(recti.X == 45 && recti.Y == 20 && recti.Width == 50 && recti.Height == 25, + "expected 45,20-50,25, got %i,%i-%i,%i\n", recti.X, recti.Y, recti.Width, recti.Height); + status = GdipSetEmpty(region); expect(Ok, status); status = GdipGetClip(graphics, region);

1 0

Shawn M. Chapla : gdiplus: Add missing allocation failure checks to graphics functions.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: c155b043fd62e2482d05fa62ad5382d96a2e9823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c155b043fd62e2482d05fa62… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Aug 25 18:13:39 2020 -0400 gdiplus: Add missing allocation failure checks to graphics functions. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5702200324..c3542b3d65 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5192,7 +5192,14 @@ GpStatus gdip_format_string(HDC hdc, } if (hotkeyprefix_count) + { hotkeyprefix_offsets = heap_alloc_zero(sizeof(INT) * hotkeyprefix_count); + if (!hotkeyprefix_offsets) + { + heap_free(stringdup); + return OutOfMemory; + } + } hotkeyprefix_count = 0; @@ -6555,6 +6562,7 @@ GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics *graphics,GpPen *pen,GDIPCONST G if(count<=0) return InvalidParameter; ptf = heap_alloc_zero(sizeof(GpPointF) * count); + if (!ptf) return OutOfMemory; for(i = 0;i < count; i++){ ptf[i].X = (REAL)points[i].X;

1 0

Shawn M. Chapla : gdiplus: Remove outdated FIXME comment about compositing mode.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 1f8e40e46124845a10d940ca8e3abd12c1d07b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8e40e46124845a10d940ca… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Aug 25 18:13:38 2020 -0400 gdiplus: Remove outdated FIXME comment about compositing mode. Removes an outdated comment about graphics compositing mode being unused. Graphics compositing mode has been used in pixel blending since a16a4d97. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f0da41c6cb..5702200324 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4781,7 +4781,6 @@ GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics *graphics, GpRect *rect) return GdipGetRegionBoundsI(graphics->clip, graphics, rect); } -/* FIXME: Compositing mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, CompositingMode *mode) {

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_PEEK.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: aef321ec0f9b54cc07071e0757c57b73210f304c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef321ec0f9b54cc07071e07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 14:53:03 2020 +0200 conhost: Implement IOCTL_CONDRV_PEEK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index d65a605f04..05a160f9cc 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -213,6 +213,17 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, if (in_size % sizeof(INPUT_RECORD) || *out_size) return STATUS_INVALID_PARAMETER; return write_console_input( console, in_data, in_size / sizeof(INPUT_RECORD) ); + case IOCTL_CONDRV_PEEK: + { + void *result; + TRACE( "peek\n "); + if (in_size) return STATUS_INVALID_PARAMETER; + *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) ); + if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + if (*out_size) memcpy( result, console->records, *out_size ); + return STATUS_SUCCESS; + } + case IOCTL_CONDRV_GET_INPUT_INFO: { struct condrv_input_info *info;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_READ_INPUT.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: e703e2da39a411e1f0aaf6d5ff7a1fa36edb87cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e703e2da39a411e1f0aaf6d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 14:52:58 2020 +0200 conhost: Implement IOCTL_CONDRV_READ_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 + programs/conhost/conhost.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index afc91ecfce..09c48ee705 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3968,6 +3968,7 @@ static void test_pseudo_console_child(HANDLE input) ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); test_console_title(); + test_WriteConsoleInputW(input); } static DWORD WINAPI read_pipe_proc( void *handle ) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 525ca9058e..d65a605f04 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -48,6 +48,7 @@ struct console INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ unsigned int record_size; /* size of input records buffer */ + size_t pending_read; /* size of pending read buffer */ WCHAR *title; /* console title */ size_t title_len; /* length of console title */ struct history_line **history; /* lines history */ @@ -75,6 +76,36 @@ static void *alloc_ioctl_buffer( size_t size ) return ioctl_buffer; } +static NTSTATUS read_console_input( struct console *console, size_t out_size ) +{ + size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count ); + NTSTATUS status; + + TRACE("count %u\n", count); + + SERVER_START_REQ( get_next_console_request ) + { + req->handle = wine_server_obj_handle( console->server ); + req->signal = count < console->record_count; + req->read = 1; + req->status = STATUS_SUCCESS; + wine_server_add_data( req, console->records, count * sizeof(*console->records) ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + if (status) + { + ERR( "failed: %#x\n", status ); + return status; + } + + if (count < console->record_count) + memmove( console->records, console->records + count, + (console->record_count - count) * sizeof(*console->records) ); + console->record_count -= count; + return STATUS_SUCCESS; +} + /* add input events to a console input queue */ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count ) @@ -115,6 +146,11 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD } } console->record_count += count; + if (count && console->pending_read) + { + read_console_input( console, console->pending_read ); + console->pending_read = 0; + } return STATUS_SUCCESS; } @@ -156,6 +192,23 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set %x mode\n", console->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_READ_INPUT: + { + unsigned int blocking; + NTSTATUS status; + if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER; + blocking = in_size && *(unsigned int *)in_data; + if (blocking && !console->record_count && *out_size) + { + TRACE( "pending read" ); + console->pending_read = *out_size; + return STATUS_PENDING; + } + status = read_console_input( console, *out_size ); + *out_size = 0; + return status; + } + case IOCTL_CONDRV_WRITE_INPUT: if (in_size % sizeof(INPUT_RECORD) || *out_size) return STATUS_INVALID_PARAMETER; return write_console_input( console, in_data, in_size / sizeof(INPUT_RECORD) );

1 0

Jacek Caban : server: Support blocking console host ioctls.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: b75ae8c31eba2a59e2b32bf8d456ca5756ac6e0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75ae8c31eba2a59e2b32bf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 14:52:48 2020 +0200 server: Support blocking console host ioctls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 4 ++- server/console.c | 71 ++++++++++++++++++++++++++++++++++++++---- server/protocol.def | 1 + server/request.h | 5 +-- server/trace.c | 1 + 5 files changed, 73 insertions(+), 9 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index af3353eae3..76206413d4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1943,8 +1943,10 @@ struct get_next_console_request_request struct request_header __header; obj_handle_t handle; int signal; + int read; unsigned int status; /* VARARG(out_data,bytes); */ + char __pad_28[4]; }; struct get_next_console_request_reply { @@ -6333,7 +6335,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 638 +#define SERVER_PROTOCOL_VERSION 639 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 5cdf3e7822..2c2978fc0c 100644 --- a/server/console.c +++ b/server/console.c @@ -192,6 +192,7 @@ struct console_server struct object obj; /* object header */ struct console_input *console; /* attached console */ struct list queue; /* ioctl queue */ + struct list read_queue; /* blocking read queue */ int busy; /* flag if server processing an ioctl */ }; @@ -577,6 +578,12 @@ static void disconnect_console_server( struct console_server *server ) list_remove( &call->entry ); console_host_ioctl_terminate( call, STATUS_CANCELLED ); } + while (!list_empty( &server->read_queue )) + { + struct console_host_ioctl *call = LIST_ENTRY( list_head( &server->read_queue ), struct console_host_ioctl, entry ); + list_remove( &call->entry ); + console_host_ioctl_terminate( call, STATUS_CANCELLED ); + } if (server->console) { @@ -1638,10 +1645,16 @@ static struct object *create_console_server( void ) server->console = NULL; server->busy = 0; list_init( &server->queue ); + list_init( &server->read_queue ); return &server->obj; } +static int is_blocking_read_ioctl( unsigned int code ) +{ + return code == IOCTL_CONDRV_READ_INPUT; +} + static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct console_input *console = get_fd_user( fd ); @@ -2385,11 +2398,10 @@ DECL_HANDLER(get_console_wait_event) /* retrieve the next pending console ioctl request */ DECL_HANDLER(get_next_console_request) { - struct console_host_ioctl *ioctl = NULL; + struct console_host_ioctl *ioctl = NULL, *next; struct console_server *server; struct iosb *iosb = NULL; - server = (struct console_server *)get_handle_obj( current->process, req->handle, 0, &console_server_ops ); if (!server) return; @@ -2403,12 +2415,30 @@ DECL_HANDLER(get_next_console_request) if (req->signal) set_event( server->console->event); else reset_event( server->console->event ); - /* set result of previous ioctl, if any */ - if (server->busy) + if (req->read) { - unsigned int status = req->status; + /* set result of current pending ioctl */ + if (list_empty( &server->read_queue )) + { + set_error( STATUS_INVALID_HANDLE ); + release_object( server ); + return; + } + + ioctl = LIST_ENTRY( list_head( &server->read_queue ), struct console_host_ioctl, entry ); + list_remove( &ioctl->entry ); + list_move_tail( &server->queue, &server->read_queue ); + } + else if (server->busy) + { + /* set result of previous ioctl */ ioctl = LIST_ENTRY( list_head( &server->queue ), struct console_host_ioctl, entry ); list_remove( &ioctl->entry ); + } + + if (ioctl) + { + unsigned int status = req->status; if (ioctl->async) { iosb = async_get_iosb( ioctl->async ); @@ -2430,9 +2460,32 @@ DECL_HANDLER(get_next_console_request) } console_host_ioctl_terminate( ioctl, status ); if (iosb) release_object( iosb ); + + if (req->read) + { + release_object( server ); + return; + } server->busy = 0; } + /* if we have a blocking read ioctl in queue head and previous blocking read is still waiting, + * move it to read queue for execution after current read is complete. move all blocking + * ioctl at the same time to preserve their order. */ + if (!list_empty( &server->queue ) && !list_empty( &server->read_queue )) + { + ioctl = LIST_ENTRY( list_head( &server->queue ), struct console_host_ioctl, entry ); + if (is_blocking_read_ioctl( ioctl->code )) + { + LIST_FOR_EACH_ENTRY_SAFE( ioctl, next, &server->queue, struct console_host_ioctl, entry ) + { + if (!is_blocking_read_ioctl( ioctl->code )) continue; + list_remove( &ioctl->entry ); + list_add_tail( &server->read_queue, &ioctl->entry ); + } + } + } + /* return the next ioctl */ if (!list_empty( &server->queue )) { @@ -2450,7 +2503,13 @@ DECL_HANDLER(get_next_console_request) iosb->in_data = NULL; } - server->busy = 1; + if (is_blocking_read_ioctl( ioctl->code )) + { + list_remove( &ioctl->entry ); + assert( list_empty( &server->read_queue )); + list_add_tail( &server->read_queue, &ioctl->entry ); + } + else server->busy = 1; } else { diff --git a/server/protocol.def b/server/protocol.def index 75888ea9a2..14bf046816 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1526,6 +1526,7 @@ enum server_fd_type @REQ(get_next_console_request) obj_handle_t handle; /* console server handle */ int signal; /* server signal state */ + int read; /* 1 if reporting result of blocked read ioctl */ unsigned int status; /* status of previous ioctl */ VARARG(out_data,bytes); /* out_data of previous ioctl */ @REPLY diff --git a/server/request.h b/server/request.h index ba278122eb..4c16b24685 100644 --- a/server/request.h +++ b/server/request.h @@ -1136,8 +1136,9 @@ C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, group_id) == 16 ); C_ASSERT( sizeof(struct send_console_signal_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, signal) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, status) == 20 ); -C_ASSERT( sizeof(struct get_next_console_request_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, read) == 20 ); +C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, status) == 24 ); +C_ASSERT( sizeof(struct get_next_console_request_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_reply, code) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_reply, out_size) == 12 ); C_ASSERT( sizeof(struct get_next_console_request_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 42e048998c..dac0a5f6e1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2098,6 +2098,7 @@ static void dump_get_next_console_request_request( const struct get_next_console { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", signal=%d", req->signal ); + fprintf( stderr, ", read=%d", req->read ); fprintf( stderr, ", status=%08x", req->status ); dump_varargs_bytes( ", out_data=", cur_size ); }

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_WRITE_INPUT.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 4225ec994e64f365b0b093609a3343c0ae1987f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4225ec994e64f365b0b09360… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 14:52:25 2020 +0200 conhost: Implement IOCTL_CONDRV_WRITE_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c658deb1cf..525ca9058e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -45,7 +45,9 @@ struct console { HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ - unsigned int recnum; /* number of input records */ + INPUT_RECORD *records; /* input records */ + unsigned int record_count; /* number of input records */ + unsigned int record_size; /* size of input records buffer */ WCHAR *title; /* console title */ size_t title_len; /* length of console title */ struct history_line **history; /* lines history */ @@ -73,6 +75,49 @@ static void *alloc_ioctl_buffer( size_t size ) return ioctl_buffer; } +/* add input events to a console input queue */ +static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, + unsigned int count ) +{ + TRACE( "%u\n", count ); + + if (!count) return STATUS_SUCCESS; + if (console->record_count + count > console->record_size) + { + INPUT_RECORD *new_rec; + if (!(new_rec = realloc( console->records, (console->record_size * 2 + count) * sizeof(INPUT_RECORD) ))) + return STATUS_NO_MEMORY; + console->records = new_rec; + console->record_size = console->record_size * 2 + count; + } + memcpy( console->records + console->record_count, records, count * sizeof(INPUT_RECORD) ); + + if (console->mode & ENABLE_PROCESSED_INPUT) + { + unsigned int i = 0; + while (i < count) + { + if (records[i].EventType == KEY_EVENT && + records[i].Event.KeyEvent.uChar.UnicodeChar == 'C' - 64 && + !(records[i].Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) + { + if (i != count - 1) + memcpy( &console->records[console->record_count + i], + &console->records[console->record_count + i + 1], + (count - i - 1) * sizeof(INPUT_RECORD) ); + count--; + if (records[i].Event.KeyEvent.bKeyDown) + { + FIXME("CTRL C\n"); + } + } + else i++; + } + } + console->record_count += count; + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -111,6 +156,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set %x mode\n", console->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_WRITE_INPUT: + if (in_size % sizeof(INPUT_RECORD) || *out_size) return STATUS_INVALID_PARAMETER; + return write_console_input( console, in_data, in_size / sizeof(INPUT_RECORD) ); + case IOCTL_CONDRV_GET_INPUT_INFO: { struct condrv_input_info *info; @@ -124,7 +173,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, info->input_cp = console->input_cp; info->output_cp = console->output_cp; info->win = console->win; - info->input_count = console->recnum; + info->input_count = console->record_count; return STATUS_SUCCESS; } @@ -221,6 +270,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) { req->handle = wine_server_obj_handle( console->server ); req->status = status; + req->signal = console->record_count != 0; wine_server_add_data( req, ioctl_buffer, out_size ); wine_server_set_reply( req, ioctl_buffer, ioctl_buffer_size ); status = wine_server_call( req );

1 0

Dmitry Kislyuk : vbscript: Implement case-insensitive search in Replace function.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 3be18bb757de4fbd7515c47b71df70395f01a44a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3be18bb757de4fbd7515c47b… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Tue Aug 25 12:47:17 2020 -0500 vbscript: Implement case-insensitive search in Replace function. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 22 ++++++++++++++++++---- dlls/vbscript/tests/api.vbs | 34 ++++++++++++++++++++++++++++++++++ dlls/vbscript/vbregexp.c | 19 +++++++++++-------- dlls/vbscript/vbscript.h | 2 +- 4 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index cdfbdf2215..80323fe136 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2449,12 +2449,19 @@ error: static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { BSTR string, find = NULL, replace = NULL, ret; - int from = 1, cnt = -1; + int from = 1, cnt = -1, mode = 0; HRESULT hres = S_OK; TRACE("%s %s %s %u...\n", debugstr_variant(args), debugstr_variant(args+1), debugstr_variant(args+2), args_cnt); assert(3 <= args_cnt && args_cnt <= 6); + + if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || (V_VT(args+2) == VT_NULL) + || (args_cnt >= 4 && V_VT(args+3) == VT_NULL) || (args_cnt >= 5 && V_VT(args+4) == VT_NULL) + || (args_cnt == 6 && V_VT(args+5) == VT_NULL)) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + if(V_VT(args) != VT_BSTR) { hres = to_string(args, &string); if(FAILED(hres)) @@ -2499,10 +2506,17 @@ static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cn } } - if(args_cnt == 6) - FIXME("copare argument not supported\n"); + if(args_cnt == 6) { + hres = to_int(args+5, &mode); + if(FAILED(hres)) + goto error; + if (mode != 0 && mode != 1) { + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + goto error; + } + } - ret = string_replace(string, find, replace, from - 1, cnt); + ret = string_replace(string, find, replace, from - 1, cnt, mode); if(!ret) { hres = E_OUTOFMEMORY; }else if(res) { diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 4834029183..be95aae4b9 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -844,6 +844,7 @@ TestRTrim "", "" TestRTrim 123, "123" if isEnglishLang then TestRTrim true, "True" + sub test_replace(str, find, rep, exp) dim r r = Replace(str, find, rep) @@ -865,8 +866,17 @@ sub test_replace_cnt(str, find, rep, from, cnt, exp) r & """ expected """ & exp & """" end sub +sub test_replace_mode(str, find, rep, from, cnt, mode, exp) + dim r + r = Replace(str, find, rep, from, cnt, mode) + ok r = exp, "Replace(""" & str & """, """ & find & """, """ & rep & """, " & from & ", " & cnt & ", " & mode _ + & ") = """ & r & """ expected """ & exp & """" +end sub + test_replace "xx testxx(xx)", "xx", "!", "! test!(!)" +test_replace "", "x", "y", "" test_replace "xxx", "", "y", "xxx" +test_replace "yxxy", "x", "", "yy" test_replace "xxxxx", "xx", "y", "yyx" test_replace 123, 2, 6, "163" test_replace "xyz" & Chr(0) & "xyz", "y", "Y", "xYz" & Chr(0) & "xYz" @@ -884,6 +894,12 @@ test_replace_cnt "xx testxx(xx)", "xx", "!", 2, 1, "x test!(xx)" test_replace_cnt "xx testxx(xx)", "xx", "!", 1, -1, "! test!(!)" test_replace_cnt "xx testxx(xx)", "xx", "!", 1, 0, "xx testxx(xx)" +test_replace_mode "Aa testAAa(aa)", "aa", "!", 1, 2, 1, "! test!a(aa)" +test_replace_mode "aA testaa(aa)", "AA", "!", 1, 1, 1, "! testaa(aa)" +test_replace_mode "aa testAa(aa)", "aa", "!", 2, 2, 0, "a testAa(!)" +test_replace_mode "aa testAA(aA)", "Aa", "!", 1, -1, 1, "! test!(!)" +test_replace_mode "aa testaa(aa)", "A", "!", 1, -1, 1, "!! test!!(!!)" + on error resume next Replace "xx", "x", "y", -1 x = err.number @@ -902,6 +918,24 @@ x = err.number on error goto 0 ok x = 5, "err = " & x +Sub testReplaceError(arg1, arg2, arg3, arg4, arg5, arg6, error_num) + on error resume next + Dim x + + Call Err.clear() + x = Replace(arg1, arg2, arg3, arg4, arg5, arg6) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Call testReplaceError(Null, "x", "y", 1, 1, 0, 94) +Call testReplaceError("xx", null, "y", 1, 1, 0, 94) +Call testReplaceError("xx", "x", null, 1, 1, 0, 94) +Call testReplaceError("xx", "x", "y", null, 1, 0, 94) +Call testReplaceError("xx", "x", "y", 1, null, 0, 94) +Call testReplaceError("xx", "x", "y", 1, 1, null, 94) +Call testReplaceError("xx", "x", "y", 1, 1, 8, 5) + + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 60c99772d3..49046bc781 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1629,33 +1629,36 @@ static const IRegExp2Vtbl RegExp2Vtbl = { RegExp2_Replace }; -BSTR string_replace(BSTR string, BSTR find, BSTR replace, int from, int cnt) +BSTR string_replace(BSTR string, BSTR find, BSTR replace, int from, int cnt, int mode) { const WCHAR *ptr, *string_end; strbuf_t buf = { NULL, 0, 0 }; size_t replace_len, find_len; BSTR ret = NULL; HRESULT hres = S_OK; + int pos; string_end = string + SysStringLen(string); ptr = from > SysStringLen(string) ? string_end : string + from; find_len = SysStringLen(find); replace_len = SysStringLen(replace); - if(!replace_len) - cnt = 0; while(string_end - ptr >= find_len && cnt && find_len) { - if(memcmp(ptr, find, find_len * sizeof(WCHAR))) { - hres = strbuf_append(&buf, ptr, 1); + pos = FindStringOrdinal(FIND_FROMSTART, ptr, string_end - ptr, + find, find_len, mode); + + if(pos == -1) + break; + else { + hres = strbuf_append(&buf, ptr, pos); if(FAILED(hres)) break; - ptr++; - }else { hres = strbuf_append(&buf, replace, replace_len); if(FAILED(hres)) break; - ptr += find_len; + + ptr = ptr + pos + find_len; if(cnt != -1) cnt--; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index aa75b1c0dd..1edf7906af 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -393,7 +393,7 @@ static inline BOOL is_digit(WCHAR c) } HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; -BSTR string_replace(BSTR,BSTR,BSTR,int,int) DECLSPEC_HIDDEN; +BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN; HRESULT map_hres(HRESULT) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020