wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::Clear.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 7c5885117a34490b3215e12e00cec59323bcfc4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5885117a34490b3215e12e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:11 2020 +0300 msscript.ocx: Implement IScriptError::Clear. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c92a86a493..967b8d6a75 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -121,6 +121,7 @@ struct procedure_enum { typedef struct { IScriptError IScriptError_iface; + IActiveScriptError *object; LONG ref; } ScriptError; @@ -132,6 +133,7 @@ struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + ScriptError *error; SCRIPTSTATE script_state; CLSID clsid; @@ -676,9 +678,15 @@ static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, I { ScriptHost *This = impl_from_IActiveScriptSite(iface); - FIXME("(%p, %p)\n", This, script_error); + TRACE("(%p, %p)\n", This, script_error); - return E_NOTIMPL; + if (This->error) + { + IScriptError_Clear(&This->error->IScriptError_iface); + IActiveScriptError_AddRef(script_error); + This->error->object = script_error; + } + return S_FALSE; } static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) @@ -1438,7 +1446,11 @@ static void detach_script_host(ScriptHost *host) if (host->parse) IActiveScriptParse_Release(host->parse); + if (host->error) + IScriptError_Release(&host->error->IScriptError_iface); + host->parse = NULL; + host->error = NULL; host->script = NULL; } @@ -2138,6 +2150,7 @@ static ULONG WINAPI ScriptError_Release(IScriptError *iface) if (!ref) { + IScriptError_Clear(&This->IScriptError_iface); heap_free(This); } @@ -2281,9 +2294,15 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->()\n", This); + TRACE("(%p)->()\n", This); - return E_NOTIMPL; + if (This->object) + { + IActiveScriptError_Release(This->object); + This->object = NULL; + } + + return S_OK; } static const IScriptErrorVtbl ScriptErrorVtbl = { @@ -2305,7 +2324,7 @@ static const IScriptErrorVtbl ScriptErrorVtbl = { ScriptError_Clear }; -static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) +static HRESULT init_script_host(ScriptControl *control, const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; ScriptHost *host; @@ -2365,6 +2384,8 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) goto failed; } host->script_state = SCRIPTSTATE_INITIALIZED; + host->error = control->error; + IScriptError_AddRef(&host->error->IScriptError_iface); *ret = host; return S_OK; @@ -2559,7 +2580,7 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan if (!language) return S_OK; - hres = init_script_host(&clsid, &This->host); + hres = init_script_host(This, &clsid, &This->host); if (FAILED(hres)) return hres;

1 0

Gabriel Ivăncescu : msscript.ocx: Add the ScriptError stub implementation.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 4aaaae158611da4a502ca8d6b364ab6bf82cbf27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aaaae158611da4a502ca8d6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:10 2020 +0300 msscript.ocx: Add the ScriptError stub implementation. The error object has to be separate from the control, as it can be referenced while the control is released. It is also available even without a script host, and in fact the same object will be used (same address) when a host is instantiated. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 240 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 39 +++--- 2 files changed, 256 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4aaaae158611da4a502c…

1 0

Zebediah Figura : vkd3d-shader: Allow structures to be chained in any order.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: vkd3d Branch: master Commit: 9a0692978ef19fd356e0a6eecd67d1f0528ced52 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a0692978ef19fd356e0a6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 24 11:15:12 2020 -0500 vkd3d-shader: Allow structures to be chained in any order. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 14ff7f4..bb251a4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2241,7 +2241,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { - compiler->xfb_info = vkd3d_find_struct(shader_interface->next, TRANSFORM_FEEDBACK_INFO); + compiler->xfb_info = vkd3d_find_struct(compile_info->next, TRANSFORM_FEEDBACK_INFO); compiler->shader_interface = *shader_interface; if (shader_interface->push_constant_buffer_count) @@ -9110,7 +9110,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, } int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_code *spirv) + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; @@ -9127,7 +9127,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN) { - if (info && (ds_info = vkd3d_find_struct(info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) + if (info && (ds_info = vkd3d_find_struct(compile_info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) { vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_info->output_primitive); vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_info->partitioning); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3e7b6cc..e0a04fc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -364,7 +364,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } if (ret >= 0) - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, out); + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 77b07e4..25d6216 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -868,7 +868,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : server: Report named pipe device files as type "File".
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: aaea13a128b76fa0076b8852187c7d10e5eb5d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaea13a128b76fa0076b8852… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 16 19:36:03 2020 -0500 server: Report named pipe device files as type "File". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 10 ++++------ server/named_pipe.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 29c777e91e..916ac8cbe7 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1227,9 +1227,8 @@ static BOOL compare_unicode_string( const UNICODE_STRING *string, const WCHAR *e && !wcsnicmp( string->Buffer, expect, string->Length / sizeof(WCHAR) ); } -#define test_object_type(a,b) _test_object_type(__LINE__,a,b,FALSE) -#define test_object_type_todo(a,b) _test_object_type(__LINE__,a,b,TRUE) -static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name, BOOL todo ) +#define test_object_type(a,b) _test_object_type(__LINE__,a,b) +static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name ) { char buffer[1024]; UNICODE_STRING *str = (UNICODE_STRING *)buffer, expect; @@ -1243,8 +1242,7 @@ static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expect ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); ok_(__FILE__,line)( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length, "unexpected len %u\n", len ); - todo_wine_if (todo) - ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); + ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); } #define test_object_name(a,b,c) _test_object_name(__LINE__,a,b,c) @@ -1463,7 +1461,7 @@ static void test_query_object(void) ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); test_object_name( handle, L"\\Device\\NamedPipe", TRUE ); - test_object_type_todo( handle, L"File" ); + test_object_type( handle, L"File" ); test_file_info( handle ); pNtClose( handle ); diff --git a/server/named_pipe.c b/server/named_pipe.c index b259abb8de..e7e5436c0e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -273,7 +273,7 @@ static const struct object_ops named_pipe_device_file_ops = { sizeof(struct named_pipe_device_file), /* size */ named_pipe_device_file_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */

1 0

Arkadiusz Hiler : Revert "ntdll/tests: Add test to check if GetTickCount is updated after sleeping.".
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 9012096b47d8422a296734ecbedb226188e93501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9012096b47d8422a296734ec… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Aug 18 16:27:15 2020 +0300 Revert "ntdll/tests: Add test to check if GetTickCount is updated after sleeping.". This reverts commit 4617f83fcf0a34fe41b0e38dde1567195395efca. The assumption that GetTickCount() gets updated after Sleep(1) holds only when there is no other software running on the system. If any program uses timeBeginPeriod() with values 1-15 then this assumption breaks. A lot of common user software calls timeBeginPeriod() - this includes browsers, media players, voice communicators, IDEs and store fronts. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index a00d507e4e..d756a8c839 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -199,7 +199,7 @@ static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; ULONGLONG t1, t2, t3; - int i = 0, changed = 0; + int i = 0; i = 0; do @@ -253,15 +253,6 @@ static void test_user_shared_data_time(void) "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } - - for (i = 0; i < 100; i++) - { - t1 = GetTickCount(); - Sleep(1); - t2 = GetTickCount(); - if (t1 != t2) changed++; - } - todo_wine ok(changed >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", changed); } START_TEST(time)

1 0

Sven Baars : kernel32: Free the right variable (Coverity).
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 47fe53172971cfd233b30b33cf0d710c6317279c URL: https://source.winehq.org/git/wine.git/?a=commit;h=47fe53172971cfd233b30b33… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Aug 24 17:02:03 2020 +0200 kernel32: Free the right variable (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index a1b3979555..43b303fa25 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1290,7 +1290,7 @@ static BOOL delete_section( const WCHAR *filename, const WCHAR *section ) { if (!(path = get_key_value( subkey, entry ))) { - HeapFree( GetProcessHeap(), 0, path ); + HeapFree( GetProcessHeap(), 0, entry ); continue; }

1 0

Sven Baars : kernel32: Fix some string leaks (Coverity).
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 8ea62f2ed13865d866a38b80f24caca02ef72447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea62f2ed13865d866a38b80… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Aug 24 17:02:02 2020 +0200 kernel32: Fix some string leaks (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8c03a45602..a1b3979555 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1775,11 +1775,13 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, RegCloseKey( section_key ); if (res) { + HeapFree( GetProcessHeap(), 0, entry_copy ); SetLastError( res ); RegCloseKey( key ); return FALSE; } } + HeapFree( GetProcessHeap(), 0, entry_copy ); } } RegCloseKey( key ); @@ -1917,6 +1919,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, { lstrcpynW( buffer + ret, section, size - ret - 1 ); ret = min( ret + strlenW( section ) + 1, size - 1 ); + HeapFree( GetProcessHeap(), 0, section ); } RegCloseKey( key );

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_TITLE.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: d2496e2d5c5ea4bde34659ba88cea52e8c27facb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2496e2d5c5ea4bde34659ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 13:21:56 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_TITLE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 ++ programs/conhost/conhost.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 922a250993..afc91ecfce 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3966,6 +3966,8 @@ static void test_pseudo_console_child(HANDLE input) ret = SetConsoleMode(input, mode | ENABLE_AUTO_POSITION); ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + + test_console_title(); } static DWORD WINAPI read_pipe_proc( void *handle ) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7f1978bffb..c658deb1cf 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -73,6 +73,23 @@ static void *alloc_ioctl_buffer( size_t size ) return ioctl_buffer; } +static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) +{ + WCHAR *title = NULL; + + TRACE( "%s\n", debugstr_wn(in_title, size) ); + + if (size) + { + if (!(title = malloc( size ))) return STATUS_NO_MEMORY; + memcpy( title, in_title, size ); + } + free( console->title ); + console->title = title; + console->title_len = size; + return STATUS_SUCCESS; +} + static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, size_t in_size, size_t *out_size ) { @@ -180,6 +197,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; } + case IOCTL_CONDRV_SET_TITLE: + if (in_size % sizeof(WCHAR) || *out_size) return STATUS_INVALID_PARAMETER; + return set_console_title( console, in_data, in_size ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_TITLE.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: e40de801b5e757f13e5d699fa22368bf1939d444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e40de801b5e757f13e5d699f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 13:21:43 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_TITLE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 87d3a646d9..7f1978bffb 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -46,6 +46,8 @@ struct console HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ unsigned int recnum; /* number of input records */ + WCHAR *title; /* console title */ + size_t title_len; /* length of console title */ struct history_line **history; /* lines history */ unsigned int history_size; /* number of entries in history array */ unsigned int history_index; /* number of used entries in history array */ @@ -166,6 +168,18 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; } + case IOCTL_CONDRV_GET_TITLE: + { + WCHAR *result; + if (in_size) return STATUS_INVALID_PARAMETER; + TRACE( "returning title %s\n", debugstr_wn(console->title, + console->title_len / sizeof(WCHAR)) ); + if (!(result = alloc_ioctl_buffer( *out_size = min( *out_size, console->title_len )))) + return STATUS_NO_MEMORY; + if (*out_size) memcpy( result, console->title, *out_size ); + return STATUS_SUCCESS; + } + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_INPUT_INFO.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 6c7f389c5ee3a1e55835a1c25cfc4160e0f214ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c7f389c5ee3a1e55835a1c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 13:21:26 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_INPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8f6217b3e9..87d3a646d9 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -35,11 +35,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(conhost); +struct history_line +{ + size_t len; + WCHAR text[1]; +}; + struct console { HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ unsigned int recnum; /* number of input records */ + struct history_line **history; /* lines history */ unsigned int history_size; /* number of entries in history array */ unsigned int history_index; /* number of used entries in history array */ unsigned int history_mode; /* mode of history (non zero means remove doubled strings */ @@ -102,6 +109,63 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; } + case IOCTL_CONDRV_SET_INPUT_INFO: + { + const struct condrv_input_info_params *params = in_data; + TRACE( "set info\n" ); + if (in_size != sizeof(*params) || *out_size) return STATUS_INVALID_PARAMETER; + if (params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) + { + console->history_mode = params->info.history_mode; + } + if ((params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && + console->history_size != params->info.history_size) + { + struct history_line **mem = NULL; + int i, delta; + + if (params->info.history_size) + { + if (!(mem = malloc( params->info.history_size * sizeof(*mem) ))) + return STATUS_NO_MEMORY; + memset( mem, 0, params->info.history_size * sizeof(*mem) ); + } + + delta = (console->history_index > params->info.history_size) + ? (console->history_index - params->info.history_size) : 0; + + for (i = delta; i < console->history_index; i++) + { + mem[i - delta] = console->history[i]; + console->history[i] = NULL; + } + console->history_index -= delta; + + for (i = 0; i < console->history_size; i++) + free( console->history[i] ); + free( console->history ); + console->history = mem; + console->history_size = params->info.history_size; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) + { + console->edition_mode = params->info.edition_mode; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) + { + console->input_cp = params->info.input_cp; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) + { + console->output_cp = params->info.output_cp; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_WIN) + { + console->win = params->info.win; + } + return STATUS_SUCCESS; + } + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED; @@ -218,6 +282,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION; console.input_cp = console.output_cp = GetOEMCP(); console.history_size = 50; + if (!(console.history = calloc( console.history_size, sizeof(*console.history) ))) return 1; for (i = 1; i < argc; i++) {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
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