July 2022 - Wine-commits - list.winehq.org

Jeremy Newman : moving wine-announce and wine-releases mailing lists
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: website Branch: master Commit: d16bf733c69fd629d774ff278531cdd9a8c28acd URL: https://source.winehq.org/git/website.git/?a=commit;h=d16bf733c69fd629d774f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jul 7 11:49:24 2022 -0500 moving wine-announce and wine-releases mailing lists --- templates/en/forums.template | 15 ++++++--------- templates/fr/forums.template | 12 +++++------- templates/ko/forums.template | 15 +++++---------- templates/nl/forums.template | 15 +++++---------- templates/pl/forums.template | 12 ++++++------ templates/pt/forums.template | 14 ++++++-------- templates/tr/forums.template | 12 +++++------- templates/zh-cn/forums.template | 14 ++++++-------- 8 files changed, 44 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=d16bf733c69fd629d…

1 0

Dmitry Timoshkov : sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: f2583de38d4a9370137f578f8c239041ae080ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2583de38d4a9370137f578f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 6 15:30:46 2022 +0300 sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 23 ++++++++++++++++++++--- dlls/sechost/security.c | 4 ++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ed91ccc39d3..aeee279a86d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4219,6 +4219,7 @@ static void test_ConvertStringSecurityDescriptor(void) BOOL ret; DWORD GLE; DWORD altGLE; + DWORD ace_Mask; } cssd[] = { { "D:(A;;GA;;;WD)", 0xdeadbeef, FALSE, ERROR_UNKNOWN_REVISION }, @@ -4239,9 +4240,12 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(D;;GA;;; WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ - { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_ALL }, + { "D:(A;;1;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, 1 }, + { "D:(A;;020000000000;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ }, + { "D:(A;;0X40000000;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_WRITE }, + { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE }, + { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, READ_CONTROL | DELETE | WRITE_DAC | WRITE_OWNER }, { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, @@ -4275,7 +4279,20 @@ static void test_ConvertStringSecurityDescriptor(void) (cssd[i].altGLE && GLE == cssd[i].altGLE), "(%02u) Unexpected last error %ld\n", i, GLE); if (ret) + { + if (cssd[i].ace_Mask) + { + ACCESS_ALLOWED_ACE *ace; + + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(acl->AclRevision == ACL_REVISION, "(%02u) Got %u\n", i, acl->AclRevision); + + ace = (ACCESS_ALLOWED_ACE *)(acl + 1); + ok(ace->Mask == cssd[i].ace_Mask, "(%02u) Expected %08lx, got %08lx\n", + i, cssd[i].ace_Mask, ace->Mask); + } LocalFree(pSD); + } } /* test behaviour with NULL parameters */ diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 6916b3ad662..9b52d66ebe8 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -900,8 +900,8 @@ static DWORD parse_ace_right( const WCHAR **string_ptr ) const WCHAR *string = *string_ptr; unsigned int i; - if (string[0] == '0' && string[1] == 'x') - return wcstoul( string, (WCHAR **)string_ptr, 16 ); + if (iswdigit( string[0] )) + return wcstoul( string, (WCHAR **)string_ptr, 0 ); for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) {

1 0

Hugh McMaster : regedit: Remove unneeded valueDataLen override for DWORD values.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 159f3699ec5ed1e7742ef79a2fbc5b82fc12043f URL: https://source.winehq.org/git/wine.git/?a=commit;h=159f3699ec5ed1e7742ef79a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Jul 3 22:29:22 2022 +1000 regedit: Remove unneeded valueDataLen override for DWORD values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 47ce233039e..353925da90e 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -201,7 +201,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); goto done; } - if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); + buffer = heap_xalloc(valueDataLen + sizeof(WCHAR)); lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); if (lRet) {

1 0

Hugh McMaster : regedit: Correctly calculate REG_MULTI_SZ size before reading from the buffer.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 101fe51b258bc4927dab5b92abc6a53e5e235c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=101fe51b258bc4927dab5b92… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 6 22:27:48 2022 +1000 regedit: Correctly calculate REG_MULTI_SZ size before reading from the buffer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 353925da90e..b70176fbbc2 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -312,12 +312,12 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) WCHAR *tmpValueData = NULL; INT i, j, count; - for ( i = 0, count = 0; i < len - 1; i++) + for (i = 0, count = 0; i < len / sizeof(WCHAR); i++) if ( !stringValueData[i] && stringValueData[i + 1] ) count++; - tmpValueData = heap_xalloc((len + count) * sizeof(WCHAR)); + tmpValueData = heap_xalloc(len + (count * sizeof(WCHAR))); - for ( i = 0, j = 0; i < len - 1; i++) + for ( i = 0, j = 0; i < len / sizeof(WCHAR); i++) { if ( !stringValueData[i] && stringValueData[i + 1]) { @@ -327,7 +327,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else tmpValueData[j++] = stringValueData[i]; } - tmpValueData[j] = stringValueData[i]; + heap_free(stringValueData); stringValueData = tmpValueData; tmpValueData = NULL; @@ -337,7 +337,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) len = lstrlenW( stringValueData ); tmpValueData = heap_xalloc((len + 2) * sizeof(WCHAR)); - for ( i = 0, j = 0; i < len - 1; i++) + for (i = 0, j = 0; i < len; i++) { if ( stringValueData[i] == char1 && stringValueData[i + 1] == char2) { @@ -348,7 +348,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else tmpValueData[j++] = stringValueData[i]; } - tmpValueData[j++] = stringValueData[i]; + tmpValueData[j++] = 0; tmpValueData[j++] = 0; heap_free(stringValueData);

1 0

Hugh McMaster : regedit: Directly use RegQueryValueExW() instead of a helper function.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 97a380209391fd65fc99f2ee2a69efc181662ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97a380209391fd65fc99f2ee… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 6 22:35:15 2022 +1000 regedit: Directly use RegQueryValueExW() instead of a helper function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index b70176fbbc2..330b535d732 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -178,11 +178,6 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara return FALSE; } -static BOOL value_exists(HWND hwnd, HKEY hKey, const WCHAR *value_name) -{ - return !RegQueryValueExW(hKey, value_name, NULL, NULL, NULL, NULL); -} - static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) { DWORD valueDataLen; @@ -523,7 +518,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC return FALSE; } - if (value_exists(hwnd, hKey, newName)) { + if (!RegQueryValueExW(hKey, newName, NULL, NULL, NULL, NULL)) { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done; }

1 0

David Kahurani : oleaut32: Handle DATE in string form in VarFormat.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 9af3a79b96318471818e0abacfc1a6f8ecc91463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af3a79b96318471818e0aba… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jul 4 12:01:48 2022 +0300 oleaut32: Handle DATE in string form in VarFormat. Testing has proven that coercion functions should reject the value which indicates that this is handled as a special case in VarFormat Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=13778 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/oleaut32/tests/varformat.c | 4 ++-- dlls/oleaut32/varformat.c | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d238ef7b049..16506d8e97f 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -304,8 +304,8 @@ static void test_VarFormat(void) VARFMT(VT_BSTR,V_BSTR,bstrin,"<&>&",S_OK,"testing"); SysFreeString(bstrin); bstrin = SysAllocString(L"39697.11"); - todo_wine VARFMT(VT_BSTR,V_BSTR,bstrin,"hh:mm",S_OK,"02:38"); - todo_wine VARFMT(VT_BSTR,V_BSTR,bstrin,"mm-dd-yy",S_OK,"09-06-08"); + VARFMT(VT_BSTR,V_BSTR,bstrin,"hh:mm",S_OK,"02:38"); + VARFMT(VT_BSTR,V_BSTR,bstrin,"mm-dd-yy",S_OK,"09-06-08"); SysFreeString(bstrin); /* Numeric values are converted to strings then output */ VARFMT(VT_I1,V_I1,1,"<&>&",S_OK,"1"); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 1d6fac4c518..3f69a45a897 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1585,8 +1585,34 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, USHORT usFlags = dwFlags & VARIANT_CALENDAR_HIJRI ? VAR_CALENDAR_HIJRI : 0; hRes = VariantChangeTypeEx(&vDate, pVarIn, lcid, usFlags, VT_DATE); + /* 31809.40 and similar are treated as invalid by coercion functions but + * it simply is a DATE in string form as far as VarFormat is concerned + */ if (FAILED(hRes)) - return hRes; + { + if (V_TYPE(pVarIn) == VT_BSTR) + { + DATE out; + OLECHAR *endptr = NULL; + /* Try consume the string with wcstod */ + double tmp = wcstod(V_BSTR(pVarIn), &endptr); + + /* Not a double in string form */ + if (*endptr) + return hRes; + + hRes = VarDateFromR8(tmp, &out); + + if (FAILED(hRes)) + return hRes; + + V_VT(&vDate) = VT_DATE; + V_DATE(&vDate) = out; + } + else + return hRes; + } + dateHeader = (FMT_DATE_HEADER*)(rgbTok + FmtGetPositive(header)); }

1 0

Claire Girka : winepulse: Store and use device period on stream creation.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: b4aa68c9c711a7b6572fbe7cdf6d7cd7fb9303b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4aa68c9c711a7b6572fbe7c… Author: Claire Girka <claire(a)sitedethib.com> Date: Mon Jul 4 21:37:00 2022 +0200 winepulse: Store and use device period on stream creation. --- dlls/winepulse.drv/pulse.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 40f5f66c129..caf9a1c9c51 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -57,6 +57,8 @@ struct pulse_stream HANDLE event; float vol[PA_CHANNELS_MAX]; + REFERENCE_TIME def_period; + INT32 locked; BOOL started; SIZE_T bufsize_frames, real_bufsize_bytes, period_bytes; @@ -1123,10 +1125,16 @@ static NTSTATUS pulse_create_stream(void *args) if (FAILED(hr)) goto exit; - period = pulse_def_period[stream->dataflow == eCapture]; + period = 0; + hr = get_device_period_helper(params->dataflow, params->pulse_name, &period, NULL); + if (FAILED(hr)) + goto exit; + if (duration < 3 * period) duration = 3 * period; + stream->def_period = period; + stream->period_bytes = pa_frame_size(&stream->ss) * muldiv(period, stream->ss.rate, 10000000); stream->bufsize_frames = ceil((duration / 10000000.) * params->fmt->nSamplesPerSec);

1 0

Claire Girka : winepulse: Use stream-specific period in pulse_get_latency.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 45a3bfa2236265a0f4dffd6ebad6428ded4c36de URL: https://source.winehq.org/git/wine.git/?a=commit;h=45a3bfa2236265a0f4dffd6e… Author: Claire Girka <claire(a)sitedethib.com> Date: Mon Jul 4 21:37:47 2022 +0200 winepulse: Use stream-specific period in pulse_get_latency. --- dlls/winepulse.drv/pulse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index caf9a1c9c51..097c65a282d 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2118,7 +2118,7 @@ static NTSTATUS pulse_get_latency(void *args) lat = attr->minreq / pa_frame_size(&stream->ss); else lat = attr->fragsize / pa_frame_size(&stream->ss); - *params->latency = (lat * 10000000) / stream->ss.rate + pulse_def_period[0]; + *params->latency = (lat * 10000000) / stream->ss.rate + stream->def_period; pulse_unlock(); TRACE("Latency: %u ms\n", (unsigned)(*params->latency / 10000)); params->result = S_OK;

1 0

Claire Girka : winepulse: Don't probe default devices twice.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 7dff198c7c558840522d28fcfeb25fe536b0a437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dff198c7c558840522d28fc… Author: Claire Girka <claire(a)sitedethib.com> Date: Mon Jul 4 21:40:59 2022 +0200 winepulse: Don't probe default devices twice. Also drop global format and period variables --- dlls/winepulse.drv/pulse.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 097c65a282d..bd918b6f260 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -99,10 +99,6 @@ typedef struct _PhysDevice { static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; -/* Mixer format + period times */ -static WAVEFORMATEXTENSIBLE pulse_fmt[2]; -static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; - static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); static struct list g_phys_sources = LIST_INIT(g_phys_sources); @@ -797,9 +793,6 @@ static NTSTATUS pulse_test_connect(void *args) pa_context_get_server(pulse_ctx), pa_context_get_server_protocol_version(pulse_ctx)); - pulse_probe_settings(1, NULL, &pulse_fmt[0], &pulse_def_period[0], &pulse_min_period[0]); - pulse_probe_settings(0, NULL, &pulse_fmt[1], &pulse_def_period[1], &pulse_min_period[1]); - free_phys_device_lists(); list_init(&g_phys_speakers); list_init(&g_phys_sources);

1 0

Alexandre Julliard : ntdll/tests: Remove todo from tests that succeed now.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 41751e61707f893df3e5dfc66fb399413e830471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41751e61707f893df3e5dfc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 08:20:24 2022 +0200 ntdll/tests: Remove todo from tests that succeed now. Tests fixed by 95ddb7576d13d3b4bb1aa213a045771cb70a3d17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index f151d55d800..ebe39931048 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -929,7 +929,6 @@ static void test_name_limits(void) for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + wcslen(registryW)] = 'a'; str.Length = 0; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); - todo_wine ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL ); ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateKey failed %lx\n", str.Length, status ); @@ -1052,11 +1051,9 @@ static void test_name_limits(void) attr3.RootDirectory = 0; attr2.ObjectName = attr3.ObjectName = NULL; status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL ); - todo_wine ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */, "NULL: NtCreateKey failed %lx\n", status ); status = pNtCreateKey( &ret, GENERIC_ALL, &attr3, 0, NULL, 0, NULL ); - todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %lx\n", status ); status = pNtCreateKey( &ret, GENERIC_ALL, NULL, 0, NULL, 0, NULL ); ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %lx\n", status );

1 0