April 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Only the first mapping needs to be an image in NtAreMappedFilesTheSame().
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 734e3a91ac1d6d184c8b6aa18debcb7fd3c36a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=734e3a91ac1d6d184c8b6aa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 30 16:46:55 2021 +0200 server: Only the first mapping needs to be an image in NtAreMappedFilesTheSame(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37488 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 7 +++++++ server/mapping.c | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4abaa5befd1..a3b2d365c33 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1357,6 +1357,9 @@ static void test_NtAreMappedFilesTheSame(void) ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + status = pNtAreMappedFilesTheSame( GetModuleHandleA("kernel32.dll"), ptr ); + todo_wine + ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); UnmapViewOfFile( ptr ); CloseHandle( mapping ); @@ -1366,6 +1369,8 @@ static void test_NtAreMappedFilesTheSame(void) ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); + status = pNtAreMappedFilesTheSame( GetModuleHandleA("kernel32.dll"), ptr ); + ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); file2 = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); ok( file2 != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); @@ -1375,6 +1380,8 @@ static void test_NtAreMappedFilesTheSame(void) ok( ptr2 != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); status = pNtAreMappedFilesTheSame( ptr, ptr2 ); ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); + status = pNtAreMappedFilesTheSame( ptr2, ptr ); + ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); UnmapViewOfFile( ptr2 ); CloseHandle( map2 ); CloseHandle( file2 ); diff --git a/server/mapping.c b/server/mapping.c index c9d64856024..9cb24a4213f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1268,9 +1268,7 @@ DECL_HANDLER(is_same_mapping) struct memory_view *view2 = find_mapped_view( current->process, req->base2 ); if (!view1 || !view2) return; - if (!view1->fd || !view2->fd || - !(view1->flags & SEC_IMAGE) || !(view2->flags & SEC_IMAGE) || - !is_same_file_fd( view1->fd, view2->fd )) + if (!view1->fd || !view2->fd || !(view1->flags & SEC_IMAGE) || !is_same_file_fd( view1->fd, view2->fd )) set_error( STATUS_NOT_SAME_DEVICE ); }

1 0

Alexandre Julliard : server: Don't bother queuing APC_NONE apcs.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: f3d41cc7897635311cf868759f95b4bf5253703b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3d41cc7897635311cf86875… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 30 12:02:19 2021 +0200 server: Don't bother queuing APC_NONE apcs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 12 ++++++++++++ server/thread.c | 14 +++++--------- server/timer.c | 13 +++++-------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index f1c5f01fa84..bde3e15fe26 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2738,6 +2738,8 @@ static void test_QueueUserAPC(void) ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); + ret = pNtQueueApcThread(thread, NULL, 0, 0, 0); + ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); SetLastError(0xdeadbeef); ret = QueueUserAPC(user_apc, thread, 0); @@ -2745,6 +2747,16 @@ static void test_QueueUserAPC(void) ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); CloseHandle(thread); + + ret = QueueUserAPC(user_apc, GetCurrentThread(), 0); + ok(ret, "QueueUserAPC failed err %u\n", GetLastError()); + ret = SleepEx( 100, TRUE ); + ok( ret == WAIT_IO_COMPLETION, "SleepEx returned %u\n", ret); + + ret = pNtQueueApcThread( GetCurrentThread(), NULL, 0, 0, 0 ); + ok( !ret, "got %#x\n", ret); + ret = SleepEx( 100, TRUE ); + ok( ret == WAIT_OBJECT_0, "SleepEx returned %u\n", ret); } START_TEST(sync) diff --git a/server/thread.c b/server/thread.c index 878ddc08119..7b248f24a30 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1061,6 +1061,7 @@ static inline struct list *get_apc_queue( struct thread *thread, enum apc_type t switch(type) { case APC_NONE: + return NULL; case APC_USER: case APC_TIMER: return &thread->user_apc; @@ -1111,12 +1112,12 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr } } if (!thread) return 0; /* nothing found */ - queue = get_apc_queue( thread, apc->call.type ); + if (!(queue = get_apc_queue( thread, apc->call.type ))) return 1; } else { if (thread->state == TERMINATED) return 0; - queue = get_apc_queue( thread, apc->call.type ); + if (!(queue = get_apc_queue( thread, apc->call.type ))) return 1; /* send signal for system APCs if needed */ if (queue == &thread->system_apc && list_empty( queue ) && !is_in_apc_wait( thread )) { @@ -1640,13 +1641,8 @@ DECL_HANDLER(select) while (get_error() == STATUS_USER_APC) { - if (!(apc = thread_dequeue_apc( current, 0 ))) - break; - /* Optimization: ignore APC_NONE calls, they are only used to - * wake up a thread, but since we got here the thread woke up already. - */ - if (apc->call.type != APC_NONE && - (reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) + apc = thread_dequeue_apc( current, 0 ); + if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) { reply->call = apc->call; release_object( apc ); diff --git a/server/timer.c b/server/timer.c index 49483d9ae13..0c787d0b7e0 100644 --- a/server/timer.c +++ b/server/timer.c @@ -126,15 +126,12 @@ static void timer_callback( void *private ) { apc_call_t data; + assert (timer->callback); memset( &data, 0, sizeof(data) ); - if (timer->callback) - { - data.type = APC_TIMER; - data.user.timer.func = timer->callback; - data.user.timer.time = timer->when; - data.user.timer.arg = timer->arg; - } - else data.type = APC_NONE; /* wake up only */ + data.type = APC_TIMER; + data.user.timer.func = timer->callback; + data.user.timer.time = timer->when; + data.user.timer.arg = timer->arg; if (!thread_queue_apc( NULL, timer->thread, &timer->obj, &data )) {

1 0

Damjan Jovanovic : shell32/tests: Add more tests for Shell_MergeMenus().
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 7af66935a02260dd182b228e02f3852a6a7ed1dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af66935a02260dd182b228e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 30 07:39:04 2021 +0200 shell32/tests: Add more tests for Shell_MergeMenus(). Show Shell_MergeMenus() really adds the offset instead of changing IDs to start with it, and that it really honours the maximum allowed value. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 726585e39a2..dc3572abf3d 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2661,10 +2661,36 @@ static void test_unicode(void) static void test_shlmenu(void) { HRESULT hres; + HMENU src_menu, dst_menu; + int count; + MENUITEMINFOA item_info; + BOOL bres; + hres = Shell_MergeMenus (0, 0, 0x42, 0x4242, 0x424242, 0); ok (hres == 0x4242, "expected 0x4242 but got %x\n", hres); hres = Shell_MergeMenus ((HMENU)42, 0, 0x42, 0x4242, 0x424242, 0); ok (hres == 0x4242, "expected 0x4242 but got %x\n", hres); + + src_menu = CreatePopupMenu (); + ok (src_menu != NULL, "CreatePopupMenu() failed, error %d\n", GetLastError ()); + dst_menu = CreatePopupMenu (); + ok (dst_menu != NULL, "CreatePopupMenu() failed, error %d\n", GetLastError ()); + bres = InsertMenuA (src_menu, -1, MF_BYPOSITION | MF_STRING, 10, "item1"); + ok (bres, "InsertMenuA failed, error %d\n", GetLastError()); + bres = InsertMenuA (src_menu, -1, MF_BYPOSITION | MF_STRING, 11, "item2"); + ok (bres, "InsertMenuA failed, error %d\n", GetLastError()); + hres = Shell_MergeMenus (dst_menu, src_menu, 0, 123, 133, MM_SUBMENUSHAVEIDS); + ok (hres == 134, "got %d\n", hres); + count = GetMenuItemCount (dst_menu); + ok (count == 1, "got %d\n", count); + memset (&item_info, 0, sizeof(item_info)); + item_info.cbSize = sizeof(item_info); + item_info.fMask = MIIM_ID; + bres = GetMenuItemInfoA (dst_menu, 0, TRUE, &item_info); + ok (bres, "GetMenuItemInfoA failed, error %d\n", GetLastError ()); + ok (item_info.wID == 133, "got %d\n", item_info.wID); + DestroyMenu (dst_menu); + DestroyMenu (src_menu); } /* Check for old shell32 (4.0.x) */

1 0

Hans Leidekker : msv1_0: Implement SpSealMessage and SpUnsealMessage.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 7c786cfd4f8b4c5dd6e89f0894b0b4afbb6c346a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c786cfd4f8b4c5dd6e89f08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 11:59:39 2021 +0200 msv1_0: Implement SpSealMessage and SpUnsealMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 5e6372b138c..f61e3c90efe 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -1430,14 +1430,85 @@ static NTSTATUS NTAPI ntlm_SpVerifySignature( LSA_SEC_HANDLE handle, SecBufferDe return verify_signature( ctx, ctx->flags, msg, idx ); } +static NTSTATUS NTAPI ntlm_SpSealMessage( LSA_SEC_HANDLE handle, ULONG qop, SecBufferDesc *msg, ULONG msg_seq_no ) +{ + int token_idx, data_idx; + struct ntlm_ctx *ctx; + + TRACE( "%lx, %08x, %p %u\n", handle, qop, msg, msg_seq_no ); + if (qop) FIXME( "ignoring quality of protection %08x\n", qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + + if (!handle) return SEC_E_INVALID_HANDLE; + + if (!msg || !msg->pBuffers || msg->cBuffers < 2 || + (token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1 || + (data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + + if (msg->pBuffers[token_idx].cbBuffer < 16) return SEC_E_BUFFER_TOO_SMALL; + + ctx = (struct ntlm_ctx *)handle; + if (ctx->flags & FLAG_NEGOTIATE_NTLM2 && ctx->flags & FLAG_NEGOTIATE_SEAL) + { + create_signature( ctx, ctx->flags, msg, token_idx, SIGN_SEND, FALSE ); + + arc4_process( &ctx->crypt.ntlm2.send_arc4info, msg->pBuffers[data_idx].pvBuffer, + msg->pBuffers[data_idx].cbBuffer ); + if (ctx->flags & FLAG_NEGOTIATE_KEY_EXCHANGE) + arc4_process( &ctx->crypt.ntlm2.send_arc4info, (char *)msg->pBuffers[token_idx].pvBuffer + 4, 8 ); + } + else + { + char *sig = msg->pBuffers[token_idx].pvBuffer; + + create_signature( ctx, ctx->flags | FLAG_NEGOTIATE_SIGN, msg, token_idx, SIGN_SEND, FALSE ); + + arc4_process( &ctx->crypt.ntlm.arc4info, msg->pBuffers[data_idx].pvBuffer, msg->pBuffers[data_idx].cbBuffer ); + arc4_process( &ctx->crypt.ntlm.arc4info, sig + 4, 12 ); + + if (ctx->flags & FLAG_NEGOTIATE_ALWAYS_SIGN || !ctx->flags) memset( sig + 4, 0, 4 ); + } + + return SEC_E_OK; +} + +static NTSTATUS NTAPI ntlm_SpUnsealMessage( LSA_SEC_HANDLE handle, SecBufferDesc *msg, ULONG msg_seq_no, ULONG *qop ) +{ + int token_idx, data_idx; + struct ntlm_ctx *ctx; + + TRACE( "%lx, %p, %u, %p\n", handle, msg, msg_seq_no, qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + + if (!handle) return SEC_E_INVALID_HANDLE; + + if (!msg || !msg->pBuffers || msg->cBuffers < 2 || + (token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1 || + (data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + + if (msg->pBuffers[token_idx].cbBuffer < 16) return SEC_E_BUFFER_TOO_SMALL; + + ctx = (struct ntlm_ctx *)handle; + if (ctx->flags & FLAG_NEGOTIATE_NTLM2 && ctx->flags & FLAG_NEGOTIATE_SEAL) + arc4_process( &ctx->crypt.ntlm2.recv_arc4info, msg->pBuffers[data_idx].pvBuffer, + msg->pBuffers[data_idx].cbBuffer ); + else + arc4_process( &ctx->crypt.ntlm.arc4info, msg->pBuffers[data_idx].pvBuffer, + msg->pBuffers[data_idx].cbBuffer); + + /* make sure we use a session key for the signature check, SealMessage always does that, + even in the dummy case */ + return verify_signature( ctx, ctx->flags | FLAG_NEGOTIATE_SIGN, msg, token_idx ); +} + static SECPKG_USER_FUNCTION_TABLE ntlm_user_table = { ntlm_SpInstanceInit, NULL, /* SpInitUserModeContext */ ntlm_SpMakeSignature, ntlm_SpVerifySignature, - NULL, /* SpSealMessage */ - NULL, /* SpUnsealMessage */ + ntlm_SpSealMessage, + ntlm_SpUnsealMessage, NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ NULL, /* SpCompleteAuthToken */

1 0

Hans Leidekker : msv1_0: Implement SpVerifySignature.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 9894c4fba328865980f1ae8d4e31cb1f2a0aa45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9894c4fba328865980f1ae8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 11:59:38 2021 +0200 msv1_0: Implement SpVerifySignature. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index d9b9d16fa64..5e6372b138c 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -1375,12 +1375,67 @@ static NTSTATUS NTAPI ntlm_SpMakeSignature( LSA_SEC_HANDLE handle, ULONG qop, Se return create_signature( ctx, ctx->flags, msg, idx, SIGN_SEND, TRUE ); } +static NTSTATUS verify_signature( struct ntlm_ctx *ctx, unsigned int flags, SecBufferDesc *msg, int idx ) +{ + NTSTATUS status; + unsigned int i; + SecBufferDesc desc; + SecBuffer *buf; + char sig[16]; + + if (!(buf = malloc( msg->cBuffers * sizeof(*buf) ))) return SEC_E_INSUFFICIENT_MEMORY; + desc.ulVersion = SECBUFFER_VERSION; + desc.cBuffers = msg->cBuffers; + desc.pBuffers = buf; + + for (i = 0; i < msg->cBuffers; i++) + { + if (msg->pBuffers[i].BufferType == SECBUFFER_TOKEN) + { + buf[i].BufferType = SECBUFFER_TOKEN; + buf[i].cbBuffer = 16; + buf[i].pvBuffer = sig; + } + else + { + buf[i].BufferType = msg->pBuffers[i].BufferType; + buf[i].cbBuffer = msg->pBuffers[i].cbBuffer; + buf[i].pvBuffer = msg->pBuffers[i].pvBuffer; + } + } + + if ((status = create_signature( ctx, flags, &desc, idx, SIGN_RECV, TRUE )) == SEC_E_OK) + { + if (memcmp( (char *)buf[idx].pvBuffer + 8, (char *)msg->pBuffers[idx].pvBuffer + 8, 8 )) + status = SEC_E_MESSAGE_ALTERED; + } + + free( buf ); + return status; +} + +static NTSTATUS NTAPI ntlm_SpVerifySignature( LSA_SEC_HANDLE handle, SecBufferDesc *msg, ULONG msg_seq_no, ULONG *qop ) +{ + struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; + int idx; + + TRACE( "%lx, %p, %u, %p\n", handle, msg, msg_seq_no, qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + + if (!handle) return SEC_E_INVALID_HANDLE; + if (!msg || !msg->pBuffers || msg->cBuffers < 2 || (idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) + return SEC_E_INVALID_TOKEN; + if (msg->pBuffers[idx].cbBuffer < 16) return SEC_E_BUFFER_TOO_SMALL; + + return verify_signature( ctx, ctx->flags, msg, idx ); +} + static SECPKG_USER_FUNCTION_TABLE ntlm_user_table = { ntlm_SpInstanceInit, NULL, /* SpInitUserModeContext */ ntlm_SpMakeSignature, - NULL, /* SpVerifySignature */ + ntlm_SpVerifySignature, NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 0b2cb328e776362d328266e5c1bceb48240bf2b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b2cb328e776362d328266e5… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Apr 30 09:05:09 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 21290e58be5..c277f7e44fe 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-28 11:59+0300\n" +"PO-Revision-Date: 2021-04-30 09:04+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14721,10 +14721,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:180 -#, fuzzy -#| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: Nepavyko rasti nurodyto registro rakto\n" +msgstr "reg: Nepavyko prieiti prie ar sukurti nurodyto registro rakto\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Connor McAdams : winegstreamer: Delay duration query until caps have been acquired.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 2c5314d007755241a8705335ffbf94e5b60a2680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c5314d007755241a8705335… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 29 15:49:13 2021 -0500 winegstreamer: Delay duration query until caps have been acquired. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/waveparser.c | 2 +- dlls/winegstreamer/wg_parser.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index f3ea8f2b482..f78e15e5c19 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -929,7 +929,7 @@ static void test_seeking(void) duration = 0xdeadbeef; hr = IMediaSeeking_GetDuration(seeking, &duration); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(duration > 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + ok(duration > 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); stop = current = 0xdeadbeef; hr = IMediaSeeking_GetStopPosition(seeking, &stop); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5529321490e..0d59297a026 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1553,7 +1553,6 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s { struct wg_parser_stream *stream = parser->streams[i]; - stream->duration = query_duration(stream->their_src); while (!stream->has_caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) @@ -1561,6 +1560,12 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s pthread_mutex_unlock(&parser->mutex); return E_FAIL; } + /* GStreamer doesn't actually provide any guarantees about when duration + * is available, even for seekable streams. However, many elements (e.g. + * avidemux, wavparse, qtdemux) in practice record duration before + * fixing caps, so as a heuristic, wait until we get caps before trying + * to query for duration. */ + stream->duration = query_duration(stream->their_src); } pthread_mutex_unlock(&parser->mutex);

1 0

Rémi Bernon : user32: Read "Layout Id" from registry in GetKeyboardLayoutList.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 80985b7eec645ee4ae2494909ad2503d2775d20d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80985b7eec645ee4ae249490… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 30 10:43:59 2021 +0200 user32: Read "Layout Id" from registry in GetKeyboardLayoutList. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 4895a007500..97be83369d9 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1336,8 +1336,8 @@ BOOL WINAPI BlockInput(BOOL fBlockIt) */ UINT WINAPI GetKeyboardLayoutList( INT size, HKL *layouts ) { - WCHAR klid[KL_NAMELENGTH]; - UINT count, tmp, i = 0; + WCHAR klid[KL_NAMELENGTH], value[5]; + DWORD value_size, count, tmp, i = 0; HKEY hkey; HKL layout; @@ -1360,6 +1360,10 @@ UINT WINAPI GetKeyboardLayoutList( INT size, HKL *layouts ) while (!RegEnumKeyW( hkey, i++, klid, ARRAY_SIZE(klid) )) { tmp = wcstoul( klid, NULL, 16 ); + value_size = sizeof(value); + if (!RegGetValueW( hkey, klid, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size )) + tmp = MAKELONG( LOWORD( tmp ), 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff) ); + if (layout == UlongToHandle( tmp )) continue; count++;

1 0

Francois Gouget : winetest/build-patterns: Detect fixed failures at the report level.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: tools Branch: master Commit: 3928647cdad708cac2549e39e486eb2fdce5a116 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3928647cdad708cac2549e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 30 14:56:16 2021 +0200 winetest/build-patterns: Detect fixed failures at the report level. If a test configuration had a high failure rate and no longer has any failure, it is not necessary to wait for $patternbuilds builds to consider the failure fixed. Then if the failures are fixed in all test configurations, the test unit can be moved to the old/fixed failures list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 81 +++++++++++++++++++++++++++++++++++++++++++++++-- winetest/winetest.conf | 3 ++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 32bae6b..6a14fc3 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -31,7 +31,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $patternbuilds/; +use vars qw/$workdir $gitdir $patternbuilds $fixed_threshold/; require "winetest.conf"; my $name0=$0; @@ -275,6 +275,20 @@ my %reports; # The @sortedbuilds index of the most recent build with a failure. # -1 if there is none. # +# - failures +# The number of builds that had a failure between the first and last failure +# builds. +# +# - failruns +# The number of test results between the first and last failure builds. +# Note that if there are builds for which WineTest was not run this will be +# different from last-first+1. +# +# - fixedruns +# The number of successful test results following last. Note that if +# WineTest was not run (yet?) for some builds this will be different from +# @sortedbuilds-last. +# # - status # A hashtable of test results indexed by the build name. my %tests; @@ -389,6 +403,34 @@ sub fail_type($) "random"; } +sub get_fix_probability($$$) +{ + my ($failures, $failruns, $fixedruns) = @_; + + # We want a lower bound on the failure rate so we get a lower bound on the + # probability that a failure is fixed. + # So ideally we would compute the lowest failure rate that has a + # probability greater than some arbitrary value of giving us $failures in + # $failruns runs. + # - For instance a failure rate of 100% would obviously give us 2 failures + # out of 2 runs. But there is also a 49% chance for a 70% failure rate to + # have the same result. So the lowest failure rate that has more than + # an arbitrary 50% chance of matching this result is ~71%. + # - But that's hard to compute in the general case. + # - So instead just convert one failure to success and compute the ratio. + # - This gives a 0% failure rate for the 1/1 case which is fine because + # this case really does not have not enough data to derive a failure rate. + # - For the 2/2 case this gives 50% instead of a more likely value like 71%. + # But that's still good enough for our purpose. + # - The results continue on the low side up to at least $failruns=10 and + # then the difference is pretty small anyway. + my $failrate = ($failures - 1) / $failruns; + + # Then compute the probability of getting $fixedruns successes in a row. + # The complement is the probability that the failure has been fixed. + return 1 - (1 - $failrate) ** $fixedruns; +} + foreach my $testname (keys %tests) { my $test = $tests{$testname}; @@ -404,6 +446,11 @@ foreach my $testname (keys %tests) $testreport->{last} = -1; # - Type of failure: random or not (missing dll, etc.) $testreport->{failtype} = ""; + # - Statistics to compute the failure rate + $testreport->{failures} = 0; + $testreport->{failruns} = 0; + # - And the number of successful runs after the last failure + $testreport->{fixedruns} = 0; for my $i (0..(a)sortedbuilds-1) { @@ -415,6 +462,7 @@ foreach my $testname (keys %tests) $build->{hastest}->{$testname}) { $testreport->{failtype} ||= 0; # success + $testreport->{fixedruns}++; } # else WineTest was not run for this build next; @@ -437,12 +485,39 @@ foreach my $testname (keys %tests) $testreport->{first} = $i; $testreport->{last} = $i; $testreport->{failtype} = $failtype; + $testreport->{failures} = 1; + # Assume the bug was introduced with the first failure and thus + # ignore successful runs that preceded it. + $testreport->{failruns} = 1; + $testreport->{fixedruns} = 0; } else { $testreport->{last} = $i; + $testreport->{failures}++; + $testreport->{failruns} += $testreport->{fixedruns} + 1; + $testreport->{fixedruns} = 0; } } + next if (!$testreport->{failed}); + next if (!$testreport->{fixedruns}); + + if ($testreport->{failtype} eq "random") + { + # - failruns counts the number of runs from the first to the last + # failure. + # - Both failruns and fixedruns account for the builds where the + # test was not run. + # - So for instance '...eeeF._F.._' gives failures=2 (not 5), + # failruns=3 (not 4, 9 or 10), and fixedruns=2 (not 3). + $testreport->{fixed} = get_fix_probability($testreport->{failures}, $testreport->{failruns}, $testreport->{fixedruns}); + } + else + { + # Since this failure is not random, even a single success means + # it is fixed. + $testreport->{fixed} = 1; + } } } @@ -710,11 +785,13 @@ EOF my $first = @sortedbuilds; my $last = -1; + my $fixed = 1; foreach my $reportdir (keys %$pagereports) { my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); + $fixed = 0 if (($testreport->{fixed} || 0) < $fixed_threshold); $first = $testreport->{first} if ($testreport->{first} < $first); # For non-random failures we only care about the transition to # the failure state, which is recorded in 'first'. @@ -732,7 +809,7 @@ EOF } next if ($last == -1); # no report had a pattern of interest - my $listid = ($last < @sortedbuilds - $patternbuilds) ? "old" : + my $listid = ($fixed or $last < @sortedbuilds - $patternbuilds) ? "old" : ($first > $patternbuilds) ? "recent" : "regular"; push @{$lists{$listid}->{testnames}}, $testname; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index f193f8e..1f587b3 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -27,4 +27,7 @@ $maxfilesize = 1.5 * 1024 * 1024; # The number of builds after which a failure is considered old / new $patternbuilds = 10; +# Probability above which a failure is considered to be fixed (0..1) +$fixed_threshold = 0.99; + 1; # keep require happy

1 0

Francois Gouget : winetest/build-patterns: Detect fixed failures from the last failure day.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: tools Branch: master Commit: 1528f95b83cd13e118e2609cfc3752063ef22ae7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1528f95b83cd13e118e2609… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 30 14:57:14 2021 +0200 winetest/build-patterns: Detect fixed failures from the last failure day. Instead of analyzing the failures of a single report across time, this analyzes the results of the last build with failures across reports. This is then compared to the failure-free results of the next days to determine the probability that the failure has been fixed. This allows detecting when short-lived issues that impacted many test configurations are fixed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 78 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 6a14fc3..460c17c 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -252,6 +252,14 @@ my %reports; # - colors # A hashtable of colors indexed by failure count. # +# - last +# The @sortedbuilds index of the most recent build for which a report has a +# failure. -1 if there is none. +# +# - fixed +# True if the test had enough successful results after the last failure to be +# considered fixed. +# # - testreports # A hashtable mapping report directory names to objects storing the results # for that test and report combination. Each testreport object has the @@ -389,7 +397,7 @@ my @sortedreports = sort cmpreports keys %reports; # -# Analyze single-report patterns +# Analyze single-report and single-build patterns # sub fail_type($) @@ -434,6 +442,9 @@ sub get_fix_probability($$$) foreach my $testname (keys %tests) { my $test = $tests{$testname}; + $test->{last} = -1; + $test->{fixed} = 1; + foreach my $reportdir (@sortedreports) { my $testreport = $test->{testreports}->{$reportdir}; @@ -498,9 +509,18 @@ foreach my $testname (keys %tests) $testreport->{failruns} += $testreport->{fixedruns} + 1; $testreport->{fixedruns} = 0; } + if ($test->{last} < $testreport->{last}) + { + $test->{last} = $testreport->{last}; + } + } next if (!$testreport->{failed}); - next if (!$testreport->{fixedruns}); + if (!$testreport->{fixedruns}) + { + $test->{fixed} = 0; + next; + } if ($testreport->{failtype} eq "random") { @@ -518,7 +538,60 @@ foreach my $testname (keys %tests) # it is fixed. $testreport->{fixed} = 1; } + $test->{fixed} = 0 if ($testreport->{fixed} < $fixed_threshold); + } + if ($test->{last} == @sortedbuilds-1) + { + $test->{fixed} = 0; + next; + } + + # No need for further analysis if this test unit seems fixed already + next if ($test->{fixed}); + next if ($test->{last} < @sortedbuilds - $patternbuilds); + + # Analyze the pattern formed by the results from the build of the latest + # failure: sometimes a commit will cause failures in many reports and is + # fixed soon after (e.g. next day). In such a case analysing the reports + # individually does not provide enough evidence that the bug is fixed until + # many days later. But analysing the results on the last failure build can + # yield evidence of a high failure rate so that the fix is obvious in the + # next few days. + my $lastbuild = $sortedbuilds[$test->{last}]; + my ($failures, $failruns, $fixedruns); + foreach my $reportdir (keys %{$test->{testreports}}) + { + my $testreport = $test->{testreports}->{$reportdir}; + next if (!$testreport->{failed}); + + my $status = $testreport->{status}->{$lastbuild->{name}}; + if (!defined $status and + $lastbuild->{hasreport}->{$reportdir} and + $lastbuild->{hastest}->{$testname}) + { + $failruns++; + next; + } + + my $failtype = fail_type($status); + next if ($failtype ne "random"); + $failures++; + $failruns++; + + for my $i ($test->{last}+1..(a)sortedbuilds-1) + { + my $build = $sortedbuilds[$i]; + $status = $testreport->{status}->{$build->{name}}; + if (!defined $status and + $build->{hasreport}->{$reportdir} and + $build->{hastest}->{$testname}) + { + $fixedruns++; + } + } } + next if (!$fixedruns); # no evidence of the issue being fixed + $test->{fixed} = get_fix_probability($failures, $failruns, $fixedruns); } @@ -809,6 +882,7 @@ EOF } next if ($last == -1); # no report had a pattern of interest + $fixed = 1 if (($test->{fixed} || 0) >= $fixed_threshold); my $listid = ($fixed or $last < @sortedbuilds - $patternbuilds) ? "old" : ($first > $patternbuilds) ? "recent" : "regular";

1 0