- Wine-Devel - list.winehq.org

[PATCH 2/2] conhost: Improve get_output_info debug traces.
by Jacek Caban Dec. 16, 2020

Dec. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] conhost: Don't create bitmap for hidden windows.
by Jacek Caban Dec. 16, 2020

Dec. 16, 2020

Fixes performance issues in ConEmu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH v2] wintrust: Don't fail CryptCATOpen on empty file or invalid data.
by Rémi Bernon Dec. 16, 2020

Dec. 16, 2020

Fixes a regression from 699e0a55ea71e2506917e38fc85cb4ae23a9cd1a, making "winetricks dotnet30sp1" fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49831 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wintrust/crypt.c | 14 ++++++++++++-- dlls/wintrust/tests/crypt.c | 12 ++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index be869ad8277..fcf419c76d1 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -908,6 +908,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, BYTE *buffer = NULL; DWORD size, open_mode = OPEN_ALWAYS; struct cryptcat *cc; + BOOL valid; TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType); @@ -941,13 +942,15 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, HeapFree(GetProcessHeap(), 0, buffer); return INVALID_HANDLE_VALUE; } - if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) + if (!size) valid = FALSE; + else if (!ReadFile(file, buffer, size, &size, NULL)) { CloseHandle(file); HeapFree(GetProcessHeap(), 0, buffer); CryptMsgClose(hmsg); return INVALID_HANDLE_VALUE; } + else valid = CryptMsgUpdate(hmsg, buffer, size, TRUE); HeapFree(GetProcessHeap(), 0, buffer); CloseHandle(file); @@ -961,7 +964,13 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, cc->msg = hmsg; cc->encoding = dwEncodingType; - if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) + if (!valid) + { + cc->magic = CRYPTCAT_MAGIC; + SetLastError(ERROR_SUCCESS); + return cc; + } + else if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) { DWORD i, sum = 0; BYTE *p; @@ -1012,6 +1021,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, return INVALID_HANDLE_VALUE; } cc->magic = CRYPTCAT_MAGIC; + SetLastError(ERROR_SUCCESS); return cc; } HeapFree(GetProcessHeap(), 0, cc); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 1b436e9f4ab..5f9c402e00f 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -429,10 +429,10 @@ static void test_CryptCATOpen(void) } else { - todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); ret = pCryptCATClose(cat); - todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#x: failed to close file\n", flags); ret = DeleteFileW(filename); ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); } @@ -443,10 +443,10 @@ static void test_CryptCATOpen(void) SetLastError(0xdeadbeef); cat = pCryptCATOpen(filename, flags, 0, 0, 0); - todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); ret = pCryptCATClose(cat); - todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#x: failed to close file\n", flags); file = _wfopen(filename, L"r"); ret = fread(buffer, 1, sizeof(buffer), file); -- 2.29.2

1 0

[PATCH 1/3] wintrust: Refactor CryptCATOpen error handling.
by Rémi Bernon Dec. 16, 2020

Dec. 16, 2020

Make it simpler, handle all errors in the same place. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wintrust/crypt.c | 118 +++++++++++++----------------------------- 1 file changed, 36 insertions(+), 82 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index be869ad8277..4fbf75f7e0c 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -904,10 +904,10 @@ BOOL WINAPI CryptCATPersistStore(HANDLE catalog) HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, DWORD dwPublicVersion, DWORD dwEncodingType) { - HANDLE file, hmsg; - BYTE *buffer = NULL; - DWORD size, open_mode = OPEN_ALWAYS; - struct cryptcat *cc; + HANDLE file, hmsg = NULL; + BYTE *buffer = NULL, *p; + DWORD i, sum = 0, size, open_mode = OPEN_ALWAYS; + struct cryptcat *cc = NULL; TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType); @@ -929,92 +929,46 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, if (file == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; size = GetFileSize(file, NULL); - if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size))) - { - CloseHandle(file); - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } - if (!(hmsg = CryptMsgOpenToDecode(dwEncodingType, 0, 0, hProv, NULL, NULL))) - { - CloseHandle(file); - HeapFree(GetProcessHeap(), 0, buffer); - return INVALID_HANDLE_VALUE; - } - if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) - { - CloseHandle(file); - HeapFree(GetProcessHeap(), 0, buffer); - CryptMsgClose(hmsg); - return INVALID_HANDLE_VALUE; - } - HeapFree(GetProcessHeap(), 0, buffer); - CloseHandle(file); + if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size))) goto failed_alloc; + if (!(hmsg = CryptMsgOpenToDecode(dwEncodingType, 0, 0, hProv, NULL, NULL))) goto failed; + if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) goto failed; size = sizeof(DWORD); - if (!(cc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cc)))) - { - CryptMsgClose(hmsg); - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } + if (!(cc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cc)))) goto failed_alloc; cc->msg = hmsg; cc->encoding = dwEncodingType; - if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) - { - DWORD i, sum = 0; - BYTE *p; + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) goto failed; - for (i = 0; i < cc->attr_count; i++) - { - if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc); - return INVALID_HANDLE_VALUE; - } - sum += size; - } - if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc); - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } - p = (BYTE *)(cc->attr + cc->attr_count); - for (i = 0; i < cc->attr_count; i++) - { - if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc->attr); - HeapFree(GetProcessHeap(), 0, cc); - return INVALID_HANDLE_VALUE; - } - if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc->attr); - HeapFree(GetProcessHeap(), 0, cc); - return INVALID_HANDLE_VALUE; - } - p += size; - } - cc->inner = decode_inner_content(hmsg, dwEncodingType, &cc->inner_len); - if (!cc->inner || !CryptSIPRetrieveSubjectGuid(filename, NULL, &cc->subject)) - { - CryptMsgClose(hmsg); - HeapFree(GetProcessHeap(), 0, cc->attr); - HeapFree(GetProcessHeap(), 0, cc->inner); - HeapFree(GetProcessHeap(), 0, cc); - return INVALID_HANDLE_VALUE; - } - cc->magic = CRYPTCAT_MAGIC; - return cc; + for (i = 0; i < cc->attr_count; i++) + { + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) goto failed; + sum += size; + } + if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) goto failed_alloc; + p = (BYTE *)(cc->attr + cc->attr_count); + for (i = 0; i < cc->attr_count; i++) + { + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) goto failed; + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) goto failed; + p += size; } + cc->inner = decode_inner_content(hmsg, dwEncodingType, &cc->inner_len); + if (!cc->inner || !CryptSIPRetrieveSubjectGuid(filename, NULL, &cc->subject)) goto failed; + cc->magic = CRYPTCAT_MAGIC; + HeapFree(GetProcessHeap(), 0, buffer); + CloseHandle(file); + return cc; + +failed_alloc: + SetLastError(ERROR_OUTOFMEMORY); +failed: + if (cc) HeapFree(GetProcessHeap(), 0, cc->inner); + if (cc) HeapFree(GetProcessHeap(), 0, cc->attr); HeapFree(GetProcessHeap(), 0, cc); + HeapFree(GetProcessHeap(), 0, buffer); + CryptMsgClose(hmsg); + CloseHandle(file); return INVALID_HANDLE_VALUE; } -- 2.29.2

2 4

[PATCH] httpapi/tests: Sleep before calling GetOverlappedResult() in test_v2_server().
by Zebediah Figura Dec. 16, 2020

Dec. 16, 2020

This seems to be a variation of a bug already encountered; here the kernel does not report the right value in the IOSB until after completion is signaled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48587 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/httpapi/tests/httpapi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index d758dee6b2c..752d008fc6b 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -233,9 +233,11 @@ static void test_v1_server(void) ok(ret, "Got error %u.\n", GetLastError()); ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - /* 64-bit Windows 10 version 1507 apparently suffers from a bug where it - * will report success before completely filling the buffer. Wait for a - * short interval to work around this. */ + /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 + * version 1507, but probably affecting others) suffer from a bug where the + * kernel will report success before completely filling the buffer or + * reporting the correct buffer size. Wait for a short interval to work + * around this. */ Sleep(100); ok(!req->Flags, "Got flags %#x.\n", req->Flags); @@ -1306,10 +1308,14 @@ static void test_v2_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ret = WaitForSingleObject(ovl.hEvent, 100); + ok(!ret, "Got %u.\n", ret); + + Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); ok(ret, "Got error %u.\n", GetLastError()); ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - Sleep(100); ok(!req->Flags, "Got flags %#x.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); -- 2.29.2

2 1

[PATCH] wined3d: Do not create Vulkan 2D (array) views for UAVs on 3D resources.
by Henri Verbeet Dec. 16, 2020

Dec. 16, 2020

We should simply create 3D views. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f2c8ceab461..c3128c9ed4c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -688,7 +688,7 @@ static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk *context_vk, const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk, - const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool srv) + const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool rtv) { const struct wined3d_resource *resource = &texture_vk->t.resource; const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -730,7 +730,7 @@ static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk create_info.flags = 0; create_info.image = texture_vk->vk_image; create_info.viewType = vk_image_view_type_from_wined3d(resource->type, desc->flags); - if (!srv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) + if (rtv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) { if (desc->u.texture.layer_count > 1) create_info.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; @@ -823,7 +823,7 @@ static void wined3d_render_target_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); view_vk->vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), - desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, false); + desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, true); context_release(context); if (!view_vk->vk_image_view) @@ -1098,7 +1098,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), - desc, texture_vk, wined3d_format_vk(format), format->color_fixup, true); + desc, texture_vk, wined3d_format_vk(format), format->color_fixup, false); context_release(context); if (!vk_image_view) -- 2.20.1

1 0

[PATCH 4/5] msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h.
by Jacek Caban Dec. 16, 2020

Dec. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/cxx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 3/5] msvcrt: Use GCC-style assembly on Clang MSVC target.
by Jacek Caban Dec. 16, 2020

Dec. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/math.c | 14 +++++++------- dlls/msvcrt/misc.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-)

2 1

[PATCH 2/5 v2] msvcrt: Prefix *rot* functions.
by Piotr Caban Dec. 16, 2020

Dec. 16, 2020

From: Jacek Caban <jacek(a)codeweavers.com> MSVC does not allow overriding those intrinsic functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 12 ++++++------ dlls/msvcr90/msvcr90.spec | 12 ++++++------ dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 12 ++++++------ 12 files changed, 64 insertions(+), 64 deletions(-)

1 0

[PATCH 1/5 v2] ucrtbase: Improve __intrinsic_abnormal_termination stub.
by Piotr Caban Dec. 16, 2020

Dec. 16, 2020

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix spec files dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)

1 0