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

Jeremy Newman : moving wine-announce and wine-releases mailing lists
by Alexandre Julliard July 7, 2022

July 7, 2022

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

Hugh McMaster : regedit: Directly use RegQueryValueExW() instead of a helper function.
by Alexandre Julliard July 6, 2022

July 6, 2022

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 July 6, 2022

July 6, 2022

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

Hugh McMaster : regedit: Remove unneeded valueDataLen override for DWORD values.
by Alexandre Julliard July 6, 2022

July 6, 2022

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

Dmitry Timoshkov : sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.
by Alexandre Julliard July 6, 2022

July 6, 2022

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: Correctly calculate REG_MULTI_SZ size before reading from the buffer.
by Alexandre Julliard July 6, 2022

July 6, 2022

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

Alexandre Julliard : win32u: Add missing terminating null on a GUID string.
by Alexandre Julliard July 6, 2022

July 6, 2022

Module: wine Branch: master Commit: 42fe58a45289b897ae5c0dc89e64360cfe0085d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42fe58a45289b897ae5c0dc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 09:45:33 2022 +0200 win32u: Add missing terminating null on a GUID string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index a5a69a84bd9..3fa361c61a5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -177,8 +177,8 @@ static const WCHAR guid_devclass_displayW[] = static const char guid_devclass_monitorA[] = "{4D36E96E-E325-11CE-BFC1-08002BE10318}"; static const WCHAR guid_devclass_monitorW[] = - {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-' - ,'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}'}; + {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-', + 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; static const WCHAR guid_devinterface_display_adapterW[] = {'{','5','B','4','5','2','0','1','D','-','F','2','F','2','-','4','F','3','B','-',

1 0

Alexandre Julliard : ntdll: Fix the return value of NtQueryKey for a short buffer.
by Alexandre Julliard July 6, 2022

July 6, 2022

Module: wine Branch: master Commit: 4bf9d2403f269e7f3595ad075a4afee9adbda51f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bf9d2403f269e7f3595ad07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 12:46:50 2022 +0200 ntdll: Fix the return value of NtQueryKey for a short buffer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 16 +++++++++++++++- dlls/ntdll/unix/registry.c | 8 ++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 242a5b5e898..54e9b10e530 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1817,10 +1817,23 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /* non-zero buffer size, but insufficient */ + len = 0; + status = pNtQueryKey(key, KeyNameInformation, info, 1, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(length == len, "got %ld, expected %ld\n", len, length); + len = 0; + status = pNtQueryKey(key, KeyNameInformation, info, offsetof( KEY_NAME_INFORMATION, Name ) - 1, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(length == len, "got %ld, expected %ld\n", len, length); + len = 0; + status = pNtQueryKey(key, KeyNameInformation, info, offsetof( KEY_NAME_INFORMATION, Name ), &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08lx\n", status); + ok(length == len, "got %ld, expected %ld\n", len, length); + len = 0; status = pNtQueryKey(key, KeyNameInformation, info, sizeof(*info), &len); ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08lx\n", status); ok(length == len, "got %ld, expected %ld\n", len, length); @@ -1828,6 +1841,7 @@ static void test_NtQueryKey(void) info->NameLength, winetestpath.Length); /* correct buffer size */ + len = 0; status = pNtQueryKey(key, KeyNameInformation, info, length, &len); ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08lx\n", status); ok(length == len, "got %ld, expected %ld\n", len, length); diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 9c98bf48399..428f8c9eb3c 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -268,7 +268,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyBasicInformation: { KEY_BASIC_INFORMATION keyinfo; - fixed_size = (char *)keyinfo.Name - (char *)&keyinfo; keyinfo.LastWriteTime.QuadPart = reply->modif; keyinfo.TitleIndex = 0; keyinfo.NameLength = reply->namelen; @@ -279,7 +278,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyFullInformation: { KEY_FULL_INFORMATION keyinfo; - fixed_size = (char *)keyinfo.Class - (char *)&keyinfo; keyinfo.LastWriteTime.QuadPart = reply->modif; keyinfo.TitleIndex = 0; keyinfo.ClassLength = wine_server_reply_size(reply); @@ -297,7 +295,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyNodeInformation: { KEY_NODE_INFORMATION keyinfo; - fixed_size = (char *)keyinfo.Name - (char *)&keyinfo; keyinfo.LastWriteTime.QuadPart = reply->modif; keyinfo.TitleIndex = 0; if (reply->namelen < wine_server_reply_size(reply)) @@ -318,7 +315,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyNameInformation: { KEY_NAME_INFORMATION keyinfo; - fixed_size = (char *)keyinfo.Name - (char *)&keyinfo; keyinfo.NameLength = reply->namelen; memcpy( info, &keyinfo, min( length, fixed_size ) ); break; @@ -327,7 +323,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyCachedInformation: { KEY_CACHED_INFORMATION keyinfo; - fixed_size = sizeof(keyinfo); keyinfo.LastWriteTime.QuadPart = reply->modif; keyinfo.TitleIndex = 0; keyinfo.SubKeys = reply->subkeys; @@ -344,7 +339,8 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i break; } *result_len = fixed_size + reply->total; - if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; + if (length < fixed_size) ret = STATUS_BUFFER_TOO_SMALL; + else if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; } } SERVER_END_REQ;

1 0

Claire Girka : winepulse: Store and use device period on stream creation.
by Alexandre Julliard July 6, 2022

July 6, 2022

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

Alexandre Julliard : server: Store a pointer to the Wow6432Node subkey.
by Alexandre Julliard July 6, 2022

July 6, 2022

Module: wine Branch: master Commit: 6bed417bb75668cf923bea84a87e9600d8beef74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bed417bb75668cf923bea84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 15:38:14 2022 +0200 server: Store a pointer to the Wow6432Node subkey. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/server/registry.c b/server/registry.c index d3c1e5e7ad1..3c5f72a699c 100644 --- a/server/registry.c +++ b/server/registry.c @@ -86,6 +86,7 @@ struct key int last_subkey; /* last in use subkey */ int nb_subkeys; /* count of allocated subkeys */ struct key **subkeys; /* subkeys array */ + struct key *wow6432node; /* Wow6432Node subkey */ int last_value; /* last in use value */ int nb_values; /* count of allocated values in array */ struct key_value *values; /* values array */ @@ -99,9 +100,8 @@ struct key #define KEY_DELETED 0x0002 /* key has been deleted */ #define KEY_DIRTY 0x0004 /* key has been modified */ #define KEY_SYMLINK 0x0008 /* key is a symbolic link */ -#define KEY_WOW64 0x0010 /* key contains a Wow6432Node subkey */ -#define KEY_WOWSHARE 0x0020 /* key is a Wow64 shared key (used for Software\Classes) */ -#define KEY_PREDEF 0x0040 /* key is marked as predefined */ +#define KEY_WOWSHARE 0x0010 /* key is a Wow64 shared key (used for Software\Classes) */ +#define KEY_PREDEF 0x0020 /* key is marked as predefined */ /* a key value */ struct key_value @@ -519,6 +519,7 @@ static struct key *alloc_key( const struct unicode_str *name, timeout_t modif ) key->last_subkey = -1; key->nb_subkeys = 0; key->subkeys = NULL; + key->wow6432node = NULL; key->nb_values = 0; key->last_value = -1; key->values = NULL; @@ -632,7 +633,7 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n parent->subkeys[i] = parent->subkeys[i-1]; parent->subkeys[index] = key; if (is_wow6432node( key->name, key->namelen ) && !is_wow6432node( parent->name, parent->namelen )) - parent->flags |= KEY_WOW64; + parent->wow6432node = key; } return key; } @@ -651,7 +652,7 @@ static void free_subkey( struct key *parent, int index ) parent->last_subkey--; key->flags |= KEY_DELETED; key->parent = NULL; - if (is_wow6432node( key->name, key->namelen )) parent->flags &= ~KEY_WOW64; + if (parent->wow6432node == key) parent->wow6432node = NULL; release_object( key ); /* try to shrink the array */ @@ -696,15 +697,8 @@ static struct key *find_subkey( const struct key *key, const struct unicode_str /* return the wow64 variant of the key, or the key itself if none */ static struct key *find_wow64_subkey( struct key *key, const struct unicode_str *name ) { - static const struct unicode_str wow6432node_str = { wow6432node, sizeof(wow6432node) }; - int index; - - if (!(key->flags & KEY_WOW64)) return key; - if (!is_wow6432node( name->str, name->len )) - { - key = find_subkey( key, &wow6432node_str, &index ); - assert( key ); /* if KEY_WOW64 is set we must find it */ - } + if (!key->wow6432node) return key; + if (!is_wow6432node( name->str, name->len )) return key->wow6432node; return key; } @@ -1015,11 +1009,6 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) WCHAR *ptr; token.str = NULL; - if (is_wow6432node( key->name, key->namelen )) - { - set_error( STATUS_INVALID_PARAMETER ); - return -1; - } /* changing to a path is not allowed */ if (!new_name->len || !get_path_token( new_name, &token ) || token.len != new_name->len) @@ -1035,6 +1024,13 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) return -1; } + if (key == key->parent->wow6432node || is_wow6432node( new_name->str, new_name->len )) + { + set_error( STATUS_INVALID_PARAMETER ); + return -1; + } + + if (!(ptr = memdup( new_name->str, new_name->len ))) return -1; name.str = key->name;

1 0