wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Gijs Vermeulen : amstream: Increase IAudioData refcount in IAudioMediaStream::CreateSample().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 1b3121c2ed0d02c4f516c760a3e701321a2f8f4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3121c2ed0d02c4f516c760… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 29 14:44:00 2020 +0200 amstream: Increase IAudioData refcount in IAudioMediaStream::CreateSample(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 2 ++ dlls/amstream/tests/amstream.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index e888caaa98..85613f4f0e 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -202,6 +202,7 @@ static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) if (!ref) { IAMMediaStream_Release(&This->parent->IAMMediaStream_iface); + IAudioData_Release(This->audio_data); CloseHandle(This->update_event); HeapFree(GetProcessHeap(), 0, This); } @@ -378,6 +379,7 @@ static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData object->parent = parent; IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); object->audio_data = audio_data; + IAudioData_AddRef(audio_data); object->update_event = CreateEventW(NULL, FALSE, FALSE, NULL); *audio_stream_sample = &object->IAudioStreamSample_iface; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e9e9a6d825..6631fd312a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1507,9 +1507,11 @@ static void test_media_streams(void) ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); EXPECT_REF(audio_stream, 3); + EXPECT_REF(audio_data, 1); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); EXPECT_REF(audio_stream, 4); + EXPECT_REF(audio_data, 2); hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr);

1 0

Gijs Vermeulen : amstream: Increase parent IAMMediaStream refcount in IAudioMediaStream::CreateSample().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 08c076f542b7397aa78939b922ca348dd6a66588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c076f542b7397aa78939b9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 29 14:43:59 2020 +0200 amstream: Increase parent IAMMediaStream refcount in IAudioMediaStream::CreateSample(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 2 ++ dlls/amstream/tests/amstream.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 112891eeb7..e888caaa98 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -201,6 +201,7 @@ static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) if (!ref) { + IAMMediaStream_Release(&This->parent->IAMMediaStream_iface); CloseHandle(This->update_event); HeapFree(GetProcessHeap(), 0, This); } @@ -375,6 +376,7 @@ static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; object->ref = 1; object->parent = parent; + IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); object->audio_data = audio_data; object->update_event = CreateEventW(NULL, FALSE, FALSE, NULL); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c5cdd7aaee..e9e9a6d825 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1505,8 +1505,11 @@ static void test_media_streams(void) hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); + + EXPECT_REF(audio_stream, 3); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + EXPECT_REF(audio_stream, 4); hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr);

1 0

Hans Leidekker : bcrypt: Allow importing private ECDSA keys.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: d17b118f030407a973a4aaaab58774449a6235cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d17b118f030407a973a4aaaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 14:34:14 2020 +0200 bcrypt: Allow importing private ECDSA keys. Based on a patch by Derek Lesho. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 4 ++++ dlls/bcrypt/gnutls.c | 1 + dlls/bcrypt/tests/bcrypt.c | 39 +++++++++++++++++++++++++++++++++------ 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index bea2001a67..b6bb73a715 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1201,6 +1201,10 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP key_size = 32; magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; break; + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + break; default: FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 19a00e2ee2..a80bce47f9 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -952,6 +952,7 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) switch (key->alg_id) { case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: curve = GNUTLS_ECC_CURVE_SECP256R1; break; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index eb7a72e0ff..e37a33e38a 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1670,6 +1670,18 @@ static void test_key_import_export(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static BYTE eccPrivkey[] = +{ + /* X */ + 0x26, 0xff, 0x0e, 0xf9, 0x71, 0x93, 0xf8, 0xed, 0x59, 0xfa, 0x24, 0xec, 0x18, 0x13, 0xfe, 0xf5, + 0x0b, 0x4a, 0xb1, 0x27, 0xb7, 0xab, 0x3e, 0x4f, 0xc5, 0x5a, 0x91, 0xa3, 0x6e, 0x21, 0x61, 0x65, + /* Y */ + 0x62, 0x7b, 0x8b, 0x30, 0x7a, 0x63, 0x4c, 0x1a, 0xf4, 0x54, 0x54, 0xbb, 0x75, 0x59, 0x68, 0x36, + 0xfe, 0x49, 0x95, 0x75, 0x9e, 0x20, 0x3e, 0x69, 0x58, 0xb9, 0x7a, 0x84, 0x03, 0x45, 0x5c, 0x10, + /* d */ + 0xb9, 0xcd, 0xbe, 0xd4, 0x75, 0x5d, 0x05, 0xe5, 0x83, 0x0c, 0xd3, 0x37, 0x34, 0x15, 0xe3, 0x2c, + 0xe5, 0x85, 0x15, 0xa9, 0xee, 0xba, 0x94, 0x03, 0x03, 0x0b, 0x86, 0xea, 0x85, 0x40, 0xbd, 0x35, +}; static BYTE eccPubkey[] = { /* X */ @@ -1696,11 +1708,12 @@ static BYTE certSignature[] = static void test_ECDSA(void) { - BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey)]; + BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey)]; BCRYPT_ECCKEY_BLOB *ecckey = (void *)buffer; - BCRYPT_ALG_HANDLE alg = NULL; - BCRYPT_KEY_HANDLE key = NULL; + BCRYPT_ALG_HANDLE alg; + BCRYPT_KEY_HANDLE key; NTSTATUS status; + ULONG size; status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); if (status) @@ -1713,11 +1726,12 @@ static void test_ECDSA(void) memcpy(ecckey + 1, eccPubkey, sizeof(eccPubkey)); ecckey->cbKey = 2; - status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey); + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); - ecckey->cbKey = sizeof(eccPubkey) / 2; - status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); @@ -1725,6 +1739,19 @@ static void test_ECDSA(void) status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); ok(!status, "BCryptVerifySignature failed: %08x\n", status); + pBCryptDestroyKey(key); + + ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + memcpy(ecckey + 1, eccPrivkey, sizeof(eccPrivkey)); + + ecckey->cbKey = 2; + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey); + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(!status, "BCryptImportKeyPair failed: %08x\n", status); pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0);

1 0

Daniel Lehman : msvcp140_1: Add stub msvcp140_1.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 4401d4608894ba71937cd02571b689869c77f555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4401d4608894ba71937cd025… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jul 28 22:55:45 2020 -0700 msvcp140_1: Add stub msvcp140_1. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/msvcp140_1/Makefile.in | 1 + dlls/msvcp140_1/msvcp140_1.spec | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/configure b/configure index 529b416472..443e986ed5 100755 --- a/configure +++ b/configure @@ -1464,6 +1464,7 @@ enable_msvcp110 enable_msvcp120 enable_msvcp120_app enable_msvcp140 +enable_msvcp140_1 enable_msvcp60 enable_msvcp70 enable_msvcp71 @@ -20915,6 +20916,7 @@ wine_fn_config_makefile dlls/msvcp120/tests enable_tests wine_fn_config_makefile dlls/msvcp120_app enable_msvcp120_app wine_fn_config_makefile dlls/msvcp140 enable_msvcp140 wine_fn_config_makefile dlls/msvcp140/tests enable_tests +wine_fn_config_makefile dlls/msvcp140_1 enable_msvcp140_1 wine_fn_config_makefile dlls/msvcp60 enable_msvcp60 wine_fn_config_makefile dlls/msvcp60/tests enable_tests wine_fn_config_makefile dlls/msvcp70 enable_msvcp70 diff --git a/configure.ac b/configure.ac index f2d0c9cd26..dea25b0c3f 100644 --- a/configure.ac +++ b/configure.ac @@ -3512,6 +3512,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp120/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp120_app) WINE_CONFIG_MAKEFILE(dlls/msvcp140) WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_1) WINE_CONFIG_MAKEFILE(dlls/msvcp60) WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp70) diff --git a/dlls/msvcp140_1/Makefile.in b/dlls/msvcp140_1/Makefile.in new file mode 100644 index 0000000000..6582299d7d --- /dev/null +++ b/dlls/msvcp140_1/Makefile.in @@ -0,0 +1 @@ +MODULE = msvcp140_1.dll diff --git a/dlls/msvcp140_1/msvcp140_1.spec b/dlls/msvcp140_1/msvcp140_1.spec new file mode 100644 index 0000000000..bfe82ab00d --- /dev/null +++ b/dlls/msvcp140_1/msvcp140_1.spec @@ -0,0 +1,7 @@ +@ stub _Aligned_get_default_resource +@ stub _Aligned_new_delete_resource +@ stub _Aligned_set_default_resource +@ stub _Unaligned_get_default_resource +@ stub _Unaligned_new_delete_resource +@ stub _Unaligned_set_default_resource +@ stub null_memory_resource

1 0

Jactry Zeng : wininet: Handle empty expires for cookie setting.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: c06e00ee6a15fd77faf66b28edac5e84ad30b550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06e00ee6a15fd77faf66b28… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jul 29 13:39:28 2020 +0200 wininet: Handle empty expires for cookie setting. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 2 +- dlls/wininet/tests/internet.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1786b3d281..66c012a0db 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -977,7 +977,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); - if(end_ptr - data.str < ARRAY_SIZE(buf)-1) { + if(end_ptr > data.str && (end_ptr - data.str < ARRAY_SIZE(buf) - 1)) { memcpy(buf, data.str, data.len*sizeof(WCHAR)); buf[data.len] = 0; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e69b45a7e6..ef1adefd1a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -510,7 +510,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -524,16 +524,26 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", "A", buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); /* test persistent cookies */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + /* test invalid expires parameter */ + ret = InternetSetCookieA("http://testing.example.com", NULL, "Q=R; expires="); + ok(ret, "InternetSetCookie failed %#x.\n", GetLastError()); + len = 1024; + memset(buffer, 0xac, sizeof(buffer)); + ret = InternetGetCookieA("http://testing.example.com/", NULL, buffer, &len); + ok(ret, "InternetGetCookie failed %#x.\n", GetLastError()); + ok(len == 29, "got len %u.\n", len); + ok(!!strstr(buffer, "Q=R"), "cookie is not present.\n"); + len = sizeof(buffer); ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); - ok(ret, "got error %u\n", GetLastError()); - ok(len == 24, "got len %u\n", len); + ok(ret, "got error %#x\n", GetLastError()); + ok(len == 29, "got len %u\n", len); ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */

1 0

Jacek Caban : server: Remove no longer needed open_console request.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 305da71c7d8098bf2d2a07584a25be2e5fcc2b91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=305da71c7d8098bf2d2a0758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:38:28 2020 +0200 server: Remove no longer needed open_console request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 23 +---------------------- server/console.c | 22 ---------------------- server/protocol.def | 11 ----------- server/request.h | 9 --------- server/trace.c | 16 ---------------- 5 files changed, 1 insertion(+), 80 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d4bb5c9ab3..7753d24877 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1850,24 +1850,6 @@ struct free_console_reply -struct open_console_request -{ - struct request_header __header; - obj_handle_t from; - unsigned int access; - unsigned int attributes; - int share; - char __pad_28[4]; -}; -struct open_console_reply -{ - struct reply_header __header; - obj_handle_t handle; - char __pad_12[4]; -}; - - - struct attach_console_request { struct request_header __header; @@ -5572,7 +5554,6 @@ enum request REQ_set_socket_deferred, REQ_alloc_console, REQ_free_console, - REQ_open_console, REQ_attach_console, REQ_get_console_wait_event, REQ_set_console_input_info, @@ -5863,7 +5844,6 @@ union generic_request struct set_socket_deferred_request set_socket_deferred_request; struct alloc_console_request alloc_console_request; struct free_console_request free_console_request; - struct open_console_request open_console_request; struct attach_console_request attach_console_request; struct get_console_wait_event_request get_console_wait_event_request; struct set_console_input_info_request set_console_input_info_request; @@ -6152,7 +6132,6 @@ union generic_reply struct set_socket_deferred_reply set_socket_deferred_reply; struct alloc_console_reply alloc_console_reply; struct free_console_reply free_console_reply; - struct open_console_reply open_console_reply; struct attach_console_reply attach_console_reply; struct get_console_wait_event_reply get_console_wait_event_reply; struct set_console_input_info_reply set_console_input_info_reply; @@ -6376,7 +6355,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 632 +#define SERVER_PROTOCOL_VERSION 633 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 46d43e7832..0060f7cb65 100644 --- a/server/console.c +++ b/server/console.c @@ -2091,28 +2091,6 @@ DECL_HANDLER(free_console) free_console( current->process ); } -/* open a handle to the process console */ -DECL_HANDLER(open_console) -{ - struct object *obj = NULL; - - if ((obj = get_handle_obj( current->process, req->from, - FILE_READ_PROPERTIES|FILE_WRITE_PROPERTIES, &console_input_ops ))) - { - struct console_input *console = (struct console_input *)obj; - obj = (console->active) ? grab_object( console->active ) : NULL; - release_object( console ); - } - - /* FIXME: req->share is not used (as in screen buffer creation) */ - if (obj) - { - reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); - release_object( obj ); - } - else if (!get_error()) set_error( STATUS_ACCESS_DENIED ); -} - /* attach to a other process's console */ DECL_HANDLER(attach_console) { diff --git a/server/protocol.def b/server/protocol.def index b48cf70e48..c2773307a4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1472,17 +1472,6 @@ enum server_fd_type @END -/* Open a handle to the process console */ -@REQ(open_console) - obj_handle_t from; /* console_in handle to get active screen buffer */ - unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ - int share; /* share mask (only for output handles) */ -@REPLY - obj_handle_t handle; /* handle to the console */ -@END - - /* Attach to a other process's console */ @REQ(attach_console) process_id_t pid; /* pid of attached console process */ diff --git a/server/request.h b/server/request.h index fd5141d6cb..190581332b 100644 --- a/server/request.h +++ b/server/request.h @@ -183,7 +183,6 @@ DECL_HANDLER(enable_socket_event); DECL_HANDLER(set_socket_deferred); DECL_HANDLER(alloc_console); DECL_HANDLER(free_console); -DECL_HANDLER(open_console); DECL_HANDLER(attach_console); DECL_HANDLER(get_console_wait_event); DECL_HANDLER(set_console_input_info); @@ -473,7 +472,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_socket_deferred, (req_handler)req_alloc_console, (req_handler)req_free_console, - (req_handler)req_open_console, (req_handler)req_attach_console, (req_handler)req_get_console_wait_event, (req_handler)req_set_console_input_info, @@ -1112,13 +1110,6 @@ C_ASSERT( sizeof(struct alloc_console_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, handle_in) == 8 ); C_ASSERT( sizeof(struct alloc_console_reply) == 16 ); C_ASSERT( sizeof(struct free_console_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct open_console_request, from) == 12 ); -C_ASSERT( FIELD_OFFSET(struct open_console_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct open_console_request, attributes) == 20 ); -C_ASSERT( FIELD_OFFSET(struct open_console_request, share) == 24 ); -C_ASSERT( sizeof(struct open_console_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct open_console_reply, handle) == 8 ); -C_ASSERT( sizeof(struct open_console_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct attach_console_request, pid) == 12 ); C_ASSERT( sizeof(struct attach_console_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct attach_console_reply, std_in) == 8 ); diff --git a/server/trace.c b/server/trace.c index db5d0dd6ea..15a769fb59 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2041,19 +2041,6 @@ static void dump_free_console_request( const struct free_console_request *req ) { } -static void dump_open_console_request( const struct open_console_request *req ) -{ - fprintf( stderr, " from=%04x", req->from ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", share=%d", req->share ); -} - -static void dump_open_console_reply( const struct open_console_reply *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - static void dump_attach_console_request( const struct attach_console_request *req ) { fprintf( stderr, " pid=%04x", req->pid ); @@ -4520,7 +4507,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_socket_deferred_request, (dump_func)dump_alloc_console_request, (dump_func)dump_free_console_request, - (dump_func)dump_open_console_request, (dump_func)dump_attach_console_request, (dump_func)dump_get_console_wait_event_request, (dump_func)dump_set_console_input_info_request, @@ -4807,7 +4793,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_alloc_console_reply, NULL, - (dump_func)dump_open_console_reply, (dump_func)dump_attach_console_reply, (dump_func)dump_get_console_wait_event_reply, NULL, @@ -5094,7 +5079,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_socket_deferred", "alloc_console", "free_console", - "open_console", "attach_console", "get_console_wait_event", "set_console_input_info",

1 0

Jacek Caban : server: Remove no longer needed CONSOLE_RENDERER_ACTIVE_SB_EVENT events.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: c37c9bf65a6f6dfd9708f6654227a953504dc158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37c9bf65a6f6dfd9708f665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:38:04 2020 +0200 server: Remove no longer needed CONSOLE_RENDERER_ACTIVE_SB_EVENT events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 - programs/wineconsole/wineconsole.c | 18 ------------------ server/console.c | 4 ---- 3 files changed, 23 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index a6df63155c..d42128f810 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -206,7 +206,6 @@ enum condrv_renderer_event_type { CONSOLE_RENDERER_NONE_EVENT, CONSOLE_RENDERER_TITLE_EVENT, - CONSOLE_RENDERER_ACTIVE_SB_EVENT, CONSOLE_RENDERER_SB_RESIZE_EVENT, CONSOLE_RENDERER_UPDATE_EVENT, CONSOLE_RENDERER_CURSOR_POS_EVENT, diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 63fdb7e72f..a61aad5293 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -199,7 +199,6 @@ void WINECON_GrabChanges(struct inner_data* data) struct condrv_renderer_event *evts = data->events; int i, ev_found; DWORD num; - HANDLE h; if (data->in_grab_changes) return; @@ -267,23 +266,6 @@ void WINECON_GrabChanges(struct inner_data* data) WINE_TRACE("%u/%u: title()\n", i+1, num); data->fnSetTitle(data); break; - case CONSOLE_RENDERER_ACTIVE_SB_EVENT: - SERVER_START_REQ( open_console ) - { - req->from = wine_server_obj_handle( data->hConIn ); - req->access = GENERIC_READ | GENERIC_WRITE; - req->attributes = 0; - req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; - h = wine_server_call_err( req ) ? 0 : wine_server_ptr_handle(reply->handle); - } - SERVER_END_REQ; - WINE_TRACE("%u/%u: active(%p)\n", i+1, num, h); - if (h) - { - CloseHandle(data->hConOut); - data->hConOut = h; - } - break; case CONSOLE_RENDERER_SB_RESIZE_EVENT: if (data->curcfg.sb_width != evts[i].u.resize.width || data->curcfg.sb_height != evts[i].u.resize.height) diff --git a/server/console.c b/server/console.c index add8b1278d..46d43e7832 100644 --- a/server/console.c +++ b/server/console.c @@ -496,10 +496,6 @@ static void generate_sb_initial_events( struct console_input *console_input ) struct screen_buffer *screen_buffer = console_input->active; struct condrv_renderer_event evt; - evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT; - memset(&evt.u, 0, sizeof(evt.u)); - console_input_events_append( console_input, &evt ); - evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; evt.u.resize.width = screen_buffer->width; evt.u.resize.height = screen_buffer->height;

1 0

Jacek Caban : wineconsole: Use renderer handle instead of hConOut where possible.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 1f5a45e63ecff2f83eb927e253007bd75fb36c05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5a45e63ecff2f83eb927e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:47 2020 +0200 wineconsole: Use renderer handle instead of hConOut where possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index ff38bafe2c..3f56bdb0ca 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -324,7 +324,7 @@ static void WCCURSES_ComputePositions(struct inner_data* data) data->curcfg.win_width, data->curcfg.win_height, x, y); pos.Left = pos.Top = 0; pos.Right = x - 1; pos.Bottom = y - 1; - SetConsoleWindowInfo(data->hConOut, FALSE, &pos); + SetConsoleWindowInfo(data->console, FALSE, &pos); return; /* we'll get called again upon event for new window size */ } if (PRIVATE(data)->pad) WCCURSES_PosCursor(data); diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 67531c0045..4476845154 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -687,7 +687,7 @@ static void WCUSER_CopySelectionToClipboard(const struct inner_data* data) LPWSTR end; DWORD count; - ReadConsoleOutputCharacterW(data->hConOut, p, w - 1, c, &count); + ReadConsoleOutputCharacterW(data->console, p, w - 1, c, &count); /* strip spaces from the end of the line */ end = p + w - 1; diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 7e39ed5e51..63fdb7e72f 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -70,7 +70,7 @@ static void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) COORD size = { data->curcfg.sb_width, data->curcfg.sb_height }; COORD coord = { 0, upd_tp }; - if (ReadConsoleOutputW(data->hConOut, data->cells, size, coord, &region)) + if (ReadConsoleOutputW(data->console, data->cells, size, coord, &region)) data->fnRefresh(data, upd_tp, upd_bm); } @@ -186,7 +186,7 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* params.info.popup_attr = cfg->popup_attr; memcpy(params.info.color_map, cfg->color_map, sizeof(cfg->color_map)); - DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); + DeviceIoControl(data->console, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /****************************************************************** @@ -383,11 +383,11 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf * (no notification is sent when invariant operation is requested) */ cinfo.bVisible = !cfg->cursor_visible; - SetConsoleCursorInfo(data->hConOut, &cinfo); + SetConsoleCursorInfo(data->console, &cinfo); /* </FIXME> */ cinfo.bVisible = cfg->cursor_visible; /* this shall update (through notif) curcfg */ - SetConsoleCursorInfo(data->hConOut, &cinfo); + SetConsoleCursorInfo(data->console, &cinfo); } if (data->curcfg.history_size != cfg->history_size) { @@ -425,7 +425,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf params->info.font_weight = cfg->font_weight; params->info.font_pitch_family = cfg->font_pitch_family; memcpy(params + 1, cfg->face_name, len * sizeof(WCHAR)); - DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, params, sizeof(*params) + len * sizeof(WCHAR), + DeviceIoControl(data->console, IOCTL_CONDRV_SET_OUTPUT_INFO, params, sizeof(*params) + len * sizeof(WCHAR), NULL, 0, NULL, NULL); } } @@ -436,8 +436,8 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf data->curcfg.def_attr = cfg->def_attr; screen_size = cfg->win_width * (cfg->win_height + 1); - FillConsoleOutputAttribute(data->hConOut, cfg->def_attr, screen_size, top_left, &written); - SetConsoleTextAttribute(data->hConOut, cfg->def_attr); + FillConsoleOutputAttribute(data->console, cfg->def_attr, screen_size, top_left, &written); + SetConsoleTextAttribute(data->console, cfg->def_attr); } WINECON_SetColors(data, cfg); /* now let's look at the window / sb size changes... @@ -454,13 +454,13 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf #define ChgSBfWidth() do {c.X = cfg->sb_width; \ c.Y = data->curcfg.sb_height;\ - SetConsoleScreenBufferSize(data->hConOut, c);\ + SetConsoleScreenBufferSize(data->console, c);\ } while (0) #define ChgWinHPos() do {pos.Left = cfg->win_pos.X - data->curcfg.win_pos.X; \ pos.Top = 0; \ pos.Right = pos.Left + cfg->win_width - data->curcfg.win_width; \ pos.Bottom = 0; \ - SetConsoleWindowInfo(data->hConOut, FALSE, &pos);\ + SetConsoleWindowInfo(data->console, FALSE, &pos);\ } while (0) #define TstSBfHeight() (data->curcfg.sb_height != cfg->sb_height) #define TstWinVPos() (data->curcfg.win_height != cfg->win_height || data->curcfg.win_pos.Y != cfg->win_pos.Y) @@ -468,13 +468,13 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf /* since we're going to apply height after width is done, we use width as defined * in cfg, and not in data->curcfg because if won't be updated yet */ #define ChgSBfHeight() do {c.X = cfg->sb_width; c.Y = cfg->sb_height; \ - SetConsoleScreenBufferSize(data->hConOut, c); \ + SetConsoleScreenBufferSize(data->console, c); \ } while (0) #define ChgWinVPos() do {pos.Left = 0; \ pos.Top = cfg->win_pos.Y - data->curcfg.win_pos.Y; \ pos.Right = 0; \ pos.Bottom = pos.Top + cfg->win_height - data->curcfg.win_height; \ - SetConsoleWindowInfo(data->hConOut, FALSE, &pos);\ + SetConsoleWindowInfo(data->console, FALSE, &pos);\ } while (0) do @@ -582,7 +582,7 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); - if (!DeviceIoControl(data->hConOut, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + if (!DeviceIoControl(data->console, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &output_info, sizeof(output_info), NULL, NULL)) return FALSE; data->curcfg.cursor_size = output_info.cursor_size;

1 0

Jacek Caban : wineconsole: Rename hSynchro to console.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: ad1f09d57424b26bcf463dd45b5b0acb5bd97029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad1f09d57424b26bcf463dd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:28 2020 +0200 wineconsole: Rename hSynchro to console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/winecon_private.h | 2 +- programs/wineconsole/wineconsole.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index cdf05e9332..d78502a260 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -62,7 +62,7 @@ struct inner_data { HANDLE hConIn; /* console input handle */ HANDLE hConOut; /* screen buffer handle: has to be changed when active sb changes */ - HANDLE hSynchro; /* waitable handle signalled by server when something in server has been modified */ + HANDLE console; /* console renderer handle */ HANDLE hProcess; /* handle to the child process or NULL */ HWND hWnd; /* handle of 'user' window or NULL for 'curses' */ INT nCmdShow; /* argument of WinMain */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 75bb878bfd..7e39ed5e51 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -203,7 +203,7 @@ void WINECON_GrabChanges(struct inner_data* data) if (data->in_grab_changes) return; - if (!GetOverlappedResult(data->hSynchro, &data->overlapped, &num, FALSE)) + if (!GetOverlappedResult(data->console, &data->overlapped, &num, FALSE)) { if (GetLastError() == ERROR_IO_INCOMPLETE) return; ERR( "failed to get renderer events: %u\n", GetLastError() ); @@ -355,7 +355,7 @@ void WINECON_GrabChanges(struct inner_data* data) } data->in_grab_changes = FALSE; - if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, data->events, + if (!DeviceIoControl(data->console, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, data->events, sizeof(data->events), NULL, &data->overlapped) && GetLastError() != ERROR_IO_PENDING) { ERR("failed to get renderer events: %u\n", GetLastError()); @@ -550,7 +550,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->fnDeleteBackend) data->fnDeleteBackend(data); if (data->hConIn) CloseHandle(data->hConIn); if (data->hConOut) CloseHandle(data->hConOut); - if (data->hSynchro) CloseHandle(data->hSynchro); + if (data->console) CloseHandle(data->console); if (data->hProcess) CloseHandle(data->hProcess); if (data->overlapped.hEvent) CloseHandle(data->overlapped.hEvent); HeapFree(GetProcessHeap(), 0, data->curcfg.registry); @@ -664,17 +664,17 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna } SERVER_END_REQ; if (!ret) goto error; - WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->hSynchro); + WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->console); RtlInitUnicodeString(&string, renderer_pathW); attr.ObjectName = &string; - status = NtCreateFile(&data->hSynchro, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES + status = NtCreateFile(&data->console, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); if (status) goto error; h = condrv_handle(data->hConIn); - if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL)) + if (!DeviceIoControl(data->console, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL)) goto error; SERVER_START_REQ(create_console_output)

1 0

Jacek Caban : server: Allow using console ioctls on renderer object.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: fef78c4e10422319736f290e44493838e4257a04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef78c4e10422319736f290e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:12 2020 +0200 server: Allow using console ioctls on renderer object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 7a10b611c5..add8b1278d 100644 --- a/server/console.c +++ b/server/console.c @@ -1910,9 +1910,27 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct return !get_error(); } + case IOCTL_CONDRV_SCROLL: + case IOCTL_CONDRV_SET_MODE: + case IOCTL_CONDRV_WRITE_OUTPUT: + case IOCTL_CONDRV_READ_OUTPUT: + case IOCTL_CONDRV_FILL_OUTPUT: + case IOCTL_CONDRV_GET_OUTPUT_INFO: + case IOCTL_CONDRV_SET_OUTPUT_INFO: + if (!evts->console || !evts->console->active) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return screen_buffer_ioctl( evts->console->active->fd, code, async ); + default: - set_error( STATUS_INVALID_HANDLE ); - return 0; + if (!evts->console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return console_input_ioctl( evts->console->fd, code, async ); } }

1 0

← Newer
1
2
3
4
5
6
7
...
83
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 July 2020