June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH 0/1] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod

by Andrew Eikum (＠aeikum)

On a style note, please consistently use 4-space indents. There's also an unnecessary diff in `pulse_add_device`. I'd also suggest falling back to the default format, in the case where the unix call fails for some reason. But maybe there's a good reason to prefer failing? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337#note_2948

June 29, 2022

Re: [PATCH 0/1] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod

by Claire (＠ClearlyClaire)

I'm not sure using a `BOOL device` field is really an option, since there is currently no existing unix call to get those values, they are all computed in the one-shot `pulse_test_connect` then retrieved from a global object. With regards to splitting this into multiple commits, should I force-push to this branch, or make a new Merge Request? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337#note_2946

June 29, 2022

Re: [PATCH 0/1] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod

by Huw Davies (＠huw)

Rather than adding new unix calls, we should probably add a `BOOL device` field to the existing ones, like we do for `get_position`. Also, I’d suggest splitting this into two commits. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337#note_2945

June 29, 2022

Re: [PATCH v2 2/2] regedit: Use correct printf specifier for UINT64 (QWORD) values

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117889 Your paranoid android. === debian11 (build log) === error: patch failed: dlls/winepulse.drv/pulse.c:2207 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/winepulse.drv/pulse.c:2207 Task: Patch failed to apply

June 29, 2022

[PATCH v2 2/2] regedit: Use correct printf specifier for UINT64 (QWORD) values

by Hugh McMaster

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index e314862ee6f..8e40d488b15 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -122,7 +122,7 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz { UINT64 value = *(UINT64 *)data; WCHAR buf[64]; - swprintf(buf, ARRAY_SIZE(buf), L"0x%08Ix (%Iu)", value, value); + swprintf(buf, ARRAY_SIZE(buf), L"0x%08I64x (%I64u)", value, value); ListView_SetItemTextW(hwndLV, index, 2, buf); break; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/340

June 29, 2022

[PATCH v2 1/2] regedit: Pass correct data size when adding a new value via the GUI

by Hugh McMaster

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> This bug was exposed by 3b1faf59f60c2e5d91321fd8998dd81d90a13e11 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index c19ef1506fa..47ce233039e 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -443,6 +443,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW LONG lRet = ERROR_SUCCESS; WCHAR newValue[256]; UINT64 value = 0; + DWORD size_bytes; BOOL result = FALSE; int valueNum, index; HKEY hKey; @@ -466,15 +467,34 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } - - lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE *)&value, sizeof(value)); + + switch (valueType) + { + case REG_DWORD: + case REG_DWORD_BIG_ENDIAN: + size_bytes = sizeof(DWORD); + break; + case REG_QWORD: + size_bytes = sizeof(UINT64); + break; + case REG_BINARY: + size_bytes = 0; + break; + case REG_MULTI_SZ: + size_bytes = 2 * sizeof(WCHAR); + break; + default: /* REG_NONE, REG_SZ, REG_EXPAND_SZ */ + size_bytes = sizeof(WCHAR); + } + + lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE *)&value, size_bytes); if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } /* Add the new item to the listview */ - index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&value, sizeof(value), -1); + index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&value, size_bytes, -1); item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, index, (LPARAM)&item); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/340

June 29, 2022

[PATCH v2 0/2] MR340: regedit: Fix broken handling of REG_DWORD and REG_QWORD values

by Hugh McMaster (＠hmc)

-- v2: regedit: Use correct printf specifier for UINT64 (QWORD) values https://gitlab.winehq.org/wine/wine/-/merge_requests/340

June 29, 2022

Re: [PATCH 0/2] MR340: regedit: Fix broken handling of REG_DWORD and REG_QWORD values

by Hugh McMaster (＠hmc)

It's actually two Ls and I, not triple L. If `%llu` might cause an issue, I'll update the MR to use `%I64u`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/340#note_2941

June 29, 2022

[PATCH 1/1] secur32: Return a SECBUFFER_MISSING buffer from the handshake if the input message is incomplete.

by Hans Leidekker

From: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 25 +++++++++++++++++++++++-- dlls/secur32/tests/schannel.c | 21 ++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 7dc9bd1d21a..70018e57f7e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -747,6 +747,18 @@ static inline BOOL is_dtls_context(const struct schan_context *ctx) return ctx->header_size == HEADER_SIZE_DTLS; } +static void fill_missing_sec_buffer(SecBufferDesc *input, DWORD size) +{ + int idx = schan_find_sec_buffer_idx(input, 0, SECBUFFER_EMPTY); + if (idx == -1) WARN("no empty buffer\n"); + else + { + SecBuffer *buffer = &input->pBuffers[idx]; + buffer->BufferType = SECBUFFER_MISSING; + buffer->cbBuffer = size; + } +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -887,7 +899,15 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( buffer = &pInput->pBuffers[idx]; ptr = buffer->pvBuffer; - while (buffer->cbBuffer > expected_size + ctx->header_size) + if (buffer->cbBuffer < ctx->header_size) + { + TRACE("Expected at least %Iu bytes, but buffer only contains %lu bytes.\n", + ctx->header_size, buffer->cbBuffer); + fill_missing_sec_buffer(pInput, ctx->header_size - buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; + } + + while (buffer->cbBuffer >= expected_size + ctx->header_size) { record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); @@ -899,7 +919,8 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!expected_size) { TRACE("Expected at least %Iu bytes, but buffer only contains %lu bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); + max(ctx->header_size, record_size), buffer->cbBuffer); + fill_missing_sec_buffer(pInput, record_size - buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index c68474e9eae..8322b5a80a5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1132,8 +1132,10 @@ static void test_communication(void) ok( context2.dwLower == 0xdeadbeef, "Did not expect dwLower to be set on new context\n"); ok( context2.dwUpper == 0xdeadbeef, "Did not expect dwUpper to be set on new context\n"); - buffers[1].cBuffers = 1; + buffers[1].cBuffers = 2; buffers[1].pBuffers[0].cbBuffer = 0; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, @@ -1141,6 +1143,10 @@ static void test_communication(void) ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer == 5 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size.\n"); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); buf = &buffers[1].pBuffers[0]; buf->cbBuffer = buf_size; @@ -1149,6 +1155,8 @@ static void test_communication(void) return; buffers[1].pBuffers[0].cbBuffer = 4; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); @@ -1156,9 +1164,15 @@ static void test_communication(void) "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer == 1 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size.\n"); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); context2.dwLower = context2.dwUpper = 0xdeadbeef; buffers[1].pBuffers[0].cbBuffer = 5; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, &context2, &buffers[0], &attrs, NULL); @@ -1166,9 +1180,14 @@ static void test_communication(void) "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer > 5 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size\n" ); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); ok( context2.dwLower == 0xdeadbeef, "Did not expect dwLower to be set on new context\n"); ok( context2.dwUpper == 0xdeadbeef, "Did not expect dwUpper to be set on new context\n"); + buffers[1].cBuffers = 1; buffers[1].pBuffers[0].cbBuffer = ret; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/342

June 29, 2022

[PATCH 0/1] MR342: secur32: Return a SECBUFFER_MISSING buffer from the handshake if the input message is incomplete.

by Hans Leidekker (＠hans)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/342

June 29, 2022