September 2023 - Wine-Commits

Alexandre Julliard : kernel32/tests: Make the generated dlls relocatable.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 620306ffd1ed1b0346ed429e0af253b81e768ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/620306ffd1ed1b0346ed429e0af253… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 14:24:13 2023 +0200 kernel32/tests: Make the generated dlls relocatable. --- dlls/kernel32/tests/loader.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 451d7e55468..e360c24ee63 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2140,10 +2140,15 @@ static void test_import_resolution(void) int* tls_init_fn_output; UCHAR tls_init_fn[64]; /* Note: Uses rip-relative address of tls_init_fn_output, don't separate */ UCHAR entry_point_fn[16]; + struct + { + IMAGE_BASE_RELOCATION reloc; + USHORT type_off[32]; + } rel; } data, *ptr; IMAGE_NT_HEADERS nt; IMAGE_SECTION_HEADER section; - int test, tls_index_save; + int test, tls_index_save, nb_rel; #if defined(__i386__) static const UCHAR tls_init_code[] = { 0xE8, 0x00, 0x00, 0x00, 0x00, /* call 1f */ @@ -2177,10 +2182,11 @@ static void test_import_resolution(void) for (test = 0; test < 4; test++) { #define DATA_RVA(ptr) (page_size + ((char *)(ptr) - (char *)&data)) +#define ADD_RELOC(field) data.rel.type_off[nb_rel++] = (IMAGE_REL_BASED_HIGHLOW << 12) + offsetof( struct imports, field ) nt = nt_header_template; nt.FileHeader.NumberOfSections = 1; nt.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); - nt.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_32BIT_MACHINE | IMAGE_FILE_RELOCS_STRIPPED; + nt.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_32BIT_MACHINE; if (test != 2) nt.FileHeader.Characteristics |= IMAGE_FILE_DLL; nt.OptionalHeader.SectionAlignment = page_size; nt.OptionalHeader.FileAlignment = 0x200; @@ -2193,6 +2199,8 @@ static void test_import_resolution(void) nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress = DATA_RVA(data.descr); nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].Size = sizeof(data.tls); nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress = DATA_RVA(&data.tls); + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = sizeof(data.rel); + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = DATA_RVA(&data.rel); memset( &data, 0, sizeof(data) ); data.descr[0].OriginalFirstThunk = DATA_RVA( data.original_thunks ); @@ -2202,10 +2210,14 @@ static void test_import_resolution(void) strcpy( data.function.name, "CreateEventA" ); data.original_thunks[0].u1.AddressOfData = DATA_RVA( &data.function ); data.thunks[0].u1.AddressOfData = 0xdeadbeef; + nb_rel = 0; data.tls.StartAddressOfRawData = nt.OptionalHeader.ImageBase + DATA_RVA( data.tls_data ); + ADD_RELOC( tls.StartAddressOfRawData ); data.tls.EndAddressOfRawData = data.tls.StartAddressOfRawData + sizeof(data.tls_data); + ADD_RELOC( tls.EndAddressOfRawData ); data.tls.AddressOfIndex = nt.OptionalHeader.ImageBase + DATA_RVA( &data.tls_index ); + ADD_RELOC( tls.AddressOfIndex ); strcpy( data.tls_data, "hello world" ); data.tls_index = 9999; data.tls_index_hi = 9999; @@ -2220,10 +2232,15 @@ static void test_import_resolution(void) tls_init_fn_output = 9999; data.tls_init_fn_output = &tls_init_fn_output; data.tls_init_fn_list[0] = nt.OptionalHeader.ImageBase + DATA_RVA(&data.tls_init_fn); + ADD_RELOC( tls_init_fn_list[0] ); data.tls.AddressOfCallBacks = nt.OptionalHeader.ImageBase + DATA_RVA(&data.tls_init_fn_list); + ADD_RELOC( tls.AddressOfCallBacks ); nt.OptionalHeader.AddressOfEntryPoint = DATA_RVA(&data.entry_point_fn); } + data.rel.reloc.VirtualAddress = nt.OptionalHeader.SectionAlignment; + data.rel.reloc.SizeOfBlock = (char *)&data.rel.type_off[nb_rel] - (char *)&data.rel.reloc; + GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "ldr", 0, dll_name); @@ -3739,7 +3756,7 @@ static void test_ResolveDelayLoadedAPI(void) nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + 2 * sizeof(IMAGE_SECTION_HEADER); nt_header.OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress = 0x1000; - nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size = 0x100; + nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size = 2 * sizeof(idd); SetLastError(0xdeadbeef); ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); @@ -3752,8 +3769,8 @@ static void test_ResolveDelayLoadedAPI(void) /* sections */ section.PointerToRawData = nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress; section.VirtualAddress = nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress; - section.Misc.VirtualSize = 2 * sizeof(idd); - section.SizeOfRawData = section.Misc.VirtualSize; + section.Misc.VirtualSize = 0x1000; + section.SizeOfRawData = 2 * sizeof(idd); section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; SetLastError(0xdeadbeef); ret = WriteFile(hfile, &section, sizeof(section), &dummy, NULL); @@ -3762,10 +3779,10 @@ static void test_ResolveDelayLoadedAPI(void) section.PointerToRawData = 0x2000; section.VirtualAddress = 0x2000; i = ARRAY_SIZE(td); - section.Misc.VirtualSize = sizeof(test_dll) + sizeof(hint) + sizeof(test_func) + sizeof(HMODULE) + + section.SizeOfRawData = sizeof(test_dll) + sizeof(hint) + sizeof(test_func) + sizeof(HMODULE) + 2 * (i + 1) * sizeof(IMAGE_THUNK_DATA); - ok(section.Misc.VirtualSize <= 0x1000, "Too much tests, add a new section!\n"); - section.SizeOfRawData = section.Misc.VirtualSize; + ok(section.SizeOfRawData <= 0x1000, "Too much tests, add a new section!\n"); + section.Misc.VirtualSize = 0x1000; section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; SetLastError(0xdeadbeef); ret = WriteFile(hfile, &section, sizeof(section), &dummy, NULL); @@ -3881,6 +3898,9 @@ static void test_ResolveDelayLoadedAPI(void) { void *ret, *load; + /* relocate thunk address by hand since we don't generate reloc records */ + itda[i].u1.AddressOfData += (char *)hlib - (char *)nt_header.OptionalHeader.ImageBase; + if (IMAGE_SNAP_BY_ORDINAL(itdn[i].u1.Ordinal)) load = (void *)GetProcAddress(htarget, (LPSTR)IMAGE_ORDINAL(itdn[i].u1.Ordinal)); else

1 0

Biswapriyo Nath : include: Add Windows.Media.Effects.AudioEffect runtimeclass.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 5d8e135c12d8748e06ef63df6ae9f9e1700001b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d8e135c12d8748e06ef63df6ae9f9… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Sep 1 10:44:45 2023 +0530 include: Add Windows.Media.Effects.AudioEffect runtimeclass. This is required for chromium and fixes the following compiler error. In file included from media/audio/win/audio_low_latency_input_win.cc:5: ./media/audio/win/audio_low_latency_input_win.h:64:10: fatal error: windows.media.effects.h: No such file or directory 64 | #include <windows.media.effects.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~ --- include/Makefile.in | 1 + include/windows.media.effects.idl | 87 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a144a95a0e6..ec49c1f7a35 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -842,6 +842,7 @@ SOURCES = \ windows.media.capture.idl \ windows.media.closedcaptioning.idl \ windows.media.devices.idl \ + windows.media.effects.idl \ windows.media.idl \ windows.media.render.idl \ windows.media.speechrecognition.idl \ diff --git a/include/windows.media.effects.idl b/include/windows.media.effects.idl new file mode 100644 index 00000000000..87829fda0bd --- /dev/null +++ b/include/windows.media.effects.idl @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2023 Biswapriyo Nath + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows.Media.Effects { + typedef enum AudioEffectType AudioEffectType; + + interface IAudioEffect; + + runtimeclass AudioEffect; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Media.Effects.AudioEffect *>; + interface Windows.Foundation.Collections.IIterator<Windows.Media.Effects.AudioEffect *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.Effects.AudioEffect *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum AudioEffectType + { + Other = 0, + AcousticEchoCancellation = 1, + NoiseSuppression = 2, + AutomaticGainControl = 3, + BeamForming = 4, + ConstantToneRemoval = 5, + Equalizer = 6, + LoudnessEqualizer = 7, + BassBoost = 8, + VirtualSurround = 9, + VirtualHeadphones = 10, + SpeakerFill = 11, + RoomCorrection = 12, + BassManagement = 13, + EnvironmentalEffects = 14, + SpeakerProtection = 15, + SpeakerCompensation = 16, + DynamicRangeCompression = 17, + [contract(Windows.Foundation.UniversalApiContract, 12.0)] + FarFieldBeamForming = 18, + [contract(Windows.Foundation.UniversalApiContract, 13.0)] + DeepNoiseSuppression = 19, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.Effects.AudioEffect), + uuid(34aafa51-9207-4055-be93-6e5734a86ae4) + ] + interface IAudioEffect : IInspectable + { + [propget] HRESULT AudioEffectType([out, retval] Windows.Media.Effects.AudioEffectType *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(mta) + ] + runtimeclass AudioEffect + { + [default] interface Windows.Media.Effects.IAudioEffect; + } +}

1 0

Alexandre Julliard : kernel32/tests: Fix alignment issues on 64-bit.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 211293eab26fdd5deb9e7fc36d422faa3754f98a URL: https://gitlab.winehq.org/wine/wine/-/commit/211293eab26fdd5deb9e7fc36d422f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 14:22:26 2023 +0200 kernel32/tests: Fix alignment issues on 64-bit. --- dlls/kernel32/tests/loader.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f4878e9d5e2..451d7e55468 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -34,7 +34,7 @@ /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) -#define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) +#define ALIGN_SIZE(size, alignment) (((size) + ((ULONG_PTR)(alignment) - 1)) & ~(((ULONG_PTR)(alignment) - 1))) struct PROCESS_BASIC_INFORMATION_PRIVATE { @@ -917,8 +917,8 @@ static void test_Loader(void) ok(info.BaseAddress == hlib, "%p != %p\n", info.BaseAddress, hlib); ok(info.AllocationBase == hlib, "%p != %p\n", info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%lx != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); - ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "got %Ix != expected %lx\n", - info.RegionSize, ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); + ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "got %Ix != expected %x\n", + info.RegionSize, (UINT)ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); ok(info.State == MEM_COMMIT, "%lx != MEM_COMMIT\n", info.State); if (nt_header.OptionalHeader.SectionAlignment < page_size) ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%lx != PAGE_EXECUTE_WRITECOPY\n", info.Protect); @@ -952,8 +952,8 @@ static void test_Loader(void) ok(info.BaseAddress == hlib, "got %p != expected %p\n", info.BaseAddress, hlib); ok(info.AllocationBase == hlib, "%p != %p\n", info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%lx != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); - ok(info.RegionSize == ALIGN_SIZE(file_size, page_size), "got %Ix != expected %lx\n", - info.RegionSize, ALIGN_SIZE(file_size, page_size)); + ok(info.RegionSize == ALIGN_SIZE(file_size, page_size), "got %Ix != expected %x\n", + info.RegionSize, (UINT)ALIGN_SIZE(file_size, page_size)); ok(info.State == MEM_COMMIT, "%lx != MEM_COMMIT\n", info.State); ok(info.Protect == PAGE_READONLY, "%lx != PAGE_READONLY\n", info.Protect); ok(info.Type == SEC_IMAGE, "%lx != SEC_IMAGE\n", info.Type); @@ -978,15 +978,15 @@ static void test_Loader(void) if (nt_header.OptionalHeader.SectionAlignment < page_size) { ok(info.BaseAddress == hlib, "got %p != expected %p\n", info.BaseAddress, hlib); - ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "got %Ix != expected %lx\n", - info.RegionSize, ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); + ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "got %Ix != expected %x\n", + info.RegionSize, (UINT)ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%lx != PAGE_EXECUTE_WRITECOPY\n", info.Protect); } else { ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)hlib + section.VirtualAddress); - ok(info.RegionSize == ALIGN_SIZE(section.Misc.VirtualSize, page_size), "got %Ix != expected %lx\n", - info.RegionSize, ALIGN_SIZE(section.Misc.VirtualSize, page_size)); + ok(info.RegionSize == ALIGN_SIZE(section.Misc.VirtualSize, page_size), "got %Ix != expected %x\n", + info.RegionSize, (UINT)ALIGN_SIZE(section.Misc.VirtualSize, page_size)); ok(info.Protect == PAGE_READONLY, "%lx != PAGE_READONLY\n", info.Protect); } ok(info.AllocationBase == hlib, "%p != %p\n", info.AllocationBase, hlib);

1 0

Alexandre Julliard : kernel32/tests: Remove some workarounds for old Windows versions.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: d64200805b1848f782c8a4ce1fdbcb9292fffe51 URL: https://gitlab.winehq.org/wine/wine/-/commit/d64200805b1848f782c8a4ce1fdbcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 31 18:08:50 2023 +0200 kernel32/tests: Remove some workarounds for old Windows versions. --- dlls/kernel32/tests/loader.c | 287 +++++++++++++++---------------------------- 1 file changed, 101 insertions(+), 186 deletions(-)

1 0

Jeff Smith : shlwapi: Fix SHFormatDateTime implementation during DST.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 95efcca3151995fd30eeebf7d348f7c573ed065d URL: https://gitlab.winehq.org/wine/wine/-/commit/95efcca3151995fd30eeebf7d348f7… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Aug 31 22:34:08 2023 -0500 shlwapi: Fix SHFormatDateTime implementation during DST. --- dlls/shlwapi/ordinal.c | 5 ++--- dlls/shlwapi/tests/ordinal.c | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 885da3f2269..6e21bd9e075 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4288,7 +4288,6 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, #define SHFORMATDT_UNSUPPORTED_FLAGS (FDTF_RELATIVE | FDTF_LTRDATE | FDTF_RTLDATE | FDTF_NOAUTOREADINGORDER) DWORD fmt_flags = flags ? *flags : FDTF_DEFAULT; SYSTEMTIME st; - FILETIME ft; INT ret = 0; TRACE("%p %p %p %u\n", fileTime, flags, buf, size); @@ -4299,8 +4298,8 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, if (fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS) FIXME("ignoring some flags - 0x%08lx\n", fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS); - FileTimeToLocalFileTime(fileTime, &ft); - FileTimeToSystemTime(&ft, &st); + FileTimeToSystemTime(fileTime, &st); + SystemTimeToTzSpecificLocalTime(NULL, &st, &st); /* first of all date */ if (fmt_flags & (FDTF_LONGDATE | FDTF_SHORTDATE)) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 2b9cb9f3127..676a537744d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1739,7 +1739,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); @@ -1748,7 +1747,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); @@ -1758,7 +1756,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); @@ -1790,7 +1787,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d, length %d\n", ret, lstrlenA(buff)+1); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); @@ -1805,7 +1801,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); @@ -1824,7 +1819,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); @@ -1837,7 +1831,6 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); - todo_wine_if(!dstMatch) ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s)\n", buff2, buff); }

1 0

Davide Beatrici : mmdevapi: Move name string duplication in MMDevice_Create() from caller.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: cdfb85220ffa6e1bd2b701306492380ef3c74fd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cdfb85220ffa6e1bd2b70130649238… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Aug 30 00:43:30 2023 +0200 mmdevapi: Move name string duplication in MMDevice_Create() from caller. --- dlls/mmdevapi/devenum.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f93bfa83ec7..10037a7affe 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -312,7 +312,7 @@ static const WCHAR *find_product_name_override(const WCHAR *device_id) * If GUID is null, a random guid will be assigned * and the device will be created */ -static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) +static MMDevice *MMDevice_Create(const WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) { HKEY key, root; MMDevice *device, *cur = NULL; @@ -351,7 +351,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st WARN("Modifying an MMDevice with postitive reference count!\n"); free(cur->drv_id); - cur->drv_id = name; + cur->drv_id = wcsdup(name); cur->flow = flow; cur->state = state; @@ -373,7 +373,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st PROPVARIANT pv; pv.vt = VT_LPWSTR; - pv.pwszVal = name; + pv.pwszVal = cur->drv_id; if (SUCCEEDED(set_driver_prop_value(id, flow, &devicepath_key))) { PROPVARIANT pv2; @@ -482,10 +482,7 @@ HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (lstrlenW(pv.pwszVal) + 1) * sizeof(WCHAR); - WCHAR *name = malloc(size_bytes); - memcpy(name, pv.pwszVal, size_bytes); - MMDevice_Create(name, &guid, curflow, + MMDevice_Create(pv.pwszVal, &guid, curflow, DEVICE_STATE_NOTPRESENT, FALSE); CoTaskMemFree(pv.pwszVal); } @@ -544,21 +541,13 @@ HRESULT load_driver_devices(EDataFlow flow) for (i = 0; i < params.num; i++) { GUID guid; - WCHAR *id; MMDevice *dev; const WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); const char *dev_name = (char *)params.endpoints + params.endpoints[i].device; - const unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - - if (!(id = malloc(size))) { - params.result = E_OUTOFMEMORY; - goto end; - } - memcpy(id, name, size); drvs.pget_device_guid(flow, dev_name, &guid); - dev = MMDevice_Create(id, &guid, flow, DEVICE_STATE_ACTIVE, params.default_idx == i); + dev = MMDevice_Create(name, &guid, flow, DEVICE_STATE_ACTIVE, params.default_idx == i); set_format(dev); }

1 0

Brendan Shanks : winebus.sys: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 516c6af58e6aadcf7760d86859a40c03bca28890 URL: https://gitlab.winehq.org/wine/wine/-/commit/516c6af58e6aadcf7760d86859a40c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Aug 31 14:19:51 2023 -0700 winebus.sys: Ensure unixlib function tables and enum stay in sync. --- dlls/winebus.sys/unixlib.c | 2 ++ dlls/winebus.sys/unixlib.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 75d33399738..74b4992f07b 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -351,6 +351,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = unix_device_set_feature_report, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count); + void bus_event_cleanup(struct bus_event *event) { struct unix_device *iface = (struct unix_device *)(UINT_PTR)event->device; diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 68d59ac0333..731745bb9a4 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -141,6 +141,7 @@ enum unix_funcs device_set_output_report, device_get_feature_report, device_set_feature_report, + unix_funcs_count, }; static inline const char *debugstr_device_desc(struct device_desc *desc)

1 0

Jeff Smith : shlwapi/tests: Fix SHFormatDateTime test during DST.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 9bc503b6bb269f314e593726386c3cba6b1a5681 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bc503b6bb269f314e593726386c3c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Aug 31 21:12:51 2023 -0500 shlwapi/tests: Fix SHFormatDateTime test during DST. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54683 --- dlls/shlwapi/tests/ordinal.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 7cb997c304c..2b9cb9f3127 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1669,13 +1669,21 @@ static void test_SHSetWindowBits(void) static void test_SHFormatDateTimeA(const SYSTEMTIME *st) { FILETIME UNALIGNED filetime; + FILETIME UNALIGNED filetimeCheck; + SYSTEMTIME universalSystemTime; CHAR buff[100], buff2[100], buff3[100]; + BOOL dstMatch; DWORD flags; INT ret; - SystemTimeToFileTime(st, &filetime); /* SHFormatDateTime expects input as utc */ - LocalFileTimeToFileTime(&filetime, &filetime); + TzSpecificLocalTimeToSystemTime(NULL, st, &universalSystemTime); + SystemTimeToFileTime(&universalSystemTime, &filetime); + + SystemTimeToFileTime(st, &filetimeCheck); + LocalFileTimeToFileTime(&filetimeCheck, &filetimeCheck); + dstMatch = (filetime.dwHighDateTime == filetimeCheck.dwHighDateTime) && + (filetime.dwLowDateTime == filetimeCheck.dwLowDateTime); /* no way to get required buffer length here */ ret = pSHFormatDateTimeA(&filetime, NULL, NULL, 0); @@ -1731,14 +1739,18 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); /* both time flags */ flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME | FDTF_SHORTTIME; @@ -1746,7 +1758,9 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); @@ -1776,7 +1790,8 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d, length %d\n", ret, lstrlenA(buff)+1); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); @@ -1790,7 +1805,8 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0 || broken(!dstMatch) /* pre Windows 7 */, "expected (%s), got (%s) for time part\n", buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_LONGDATE | LOCALE_USE_CP_ACP, st, NULL, buff2, sizeof(buff2)); @@ -1808,7 +1824,9 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ret = GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS | LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); @@ -1819,12 +1837,15 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) ret = GetTimeFormatA(LOCALE_USER_DEFAULT, LOCALE_USE_CP_ACP, st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); strcat(buff2, buff3); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + todo_wine_if(!dstMatch) + ok(lstrcmpA(buff, buff2) == 0 || broken(!dstMatch) /* pre Windows 7 */, + "expected (%s), got (%s)\n", buff2, buff); } static void test_SHFormatDateTimeW(void) { FILETIME UNALIGNED filetime; + SYSTEMTIME universalSystemTime; WCHAR buff[100], buff2[100], buff3[100], *p1, *p2; SYSTEMTIME st; DWORD flags; @@ -1840,9 +1861,9 @@ if (0) } GetLocalTime(&st); - SystemTimeToFileTime(&st, &filetime); /* SHFormatDateTime expects input as utc */ - LocalFileTimeToFileTime(&filetime, &filetime); + TzSpecificLocalTimeToSystemTime(NULL, &st, &universalSystemTime); + SystemTimeToFileTime(&universalSystemTime, &filetime); /* no way to get required buffer length here */ SetLastError(0xdeadbeef);

1 0

Davide Beatrici : mmdevapi: Simplify load_driver_devices() by combining loops and removing unneeded allocation(s).
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: b1b231f370c7772bbbaa158d2adbf02747826ec4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1b231f370c7772bbbaa158d2adbf0… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Aug 25 14:40:46 2023 +0200 mmdevapi: Simplify load_driver_devices() by combining loops and removing unneeded allocation(s). --- dlls/mmdevapi/devenum.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 2900d222795..f93bfa83ec7 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -528,8 +528,6 @@ static HRESULT set_format(MMDevice *dev) HRESULT load_driver_devices(EDataFlow flow) { struct get_endpoint_ids_params params; - WCHAR **ids = NULL; - GUID *guids = NULL; UINT i; params.flow = flow; @@ -544,38 +542,28 @@ HRESULT load_driver_devices(EDataFlow flow) if (FAILED(params.result)) goto end; - ids = malloc(params.num * sizeof(*ids)); - guids = malloc(params.num * sizeof(*guids)); - if (!ids || !guids) { - params.result = E_OUTOFMEMORY; - goto end; - } - for (i = 0; i < params.num; i++) { + GUID guid; + WCHAR *id; + MMDevice *dev; const WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); const char *dev_name = (char *)params.endpoints + params.endpoints[i].device; const unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - if (!(ids[i] = malloc(size))) { - while (i--) free(ids[i]); + if (!(id = malloc(size))) { params.result = E_OUTOFMEMORY; goto end; } - memcpy(ids[i], name, size); - drvs.pget_device_guid(flow, dev_name, &guids[i]); - } + memcpy(id, name, size); - for (i = 0; i < params.num; i++) { - MMDevice *dev; - dev = MMDevice_Create(ids[i], &guids[i], flow, DEVICE_STATE_ACTIVE, - params.default_idx == i); + drvs.pget_device_guid(flow, dev_name, &guid); + + dev = MMDevice_Create(id, &guid, flow, DEVICE_STATE_ACTIVE, params.default_idx == i); set_format(dev); } end: free(params.endpoints); - free(guids); - free(ids); return params.result; }

1 0

Brendan Shanks : mountmgr.sys: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 9139d8705d7b7af7b8e0b4ff21cc2e3a71fcd6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9139d8705d7b7af7b8e0b4ff21cc2e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Aug 31 14:51:08 2023 -0700 mountmgr.sys: Ensure unixlib function tables and enum stay in sync. --- dlls/mountmgr.sys/unixlib.c | 2 ++ dlls/mountmgr.sys/unixlib.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index 13f6fbecf09..b74b2336a34 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -586,3 +586,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = delete_credential, enumerate_credentials, }; + +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index efbce71b979..93e812a516f 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -172,6 +172,7 @@ enum mountmgr_funcs unix_write_credential, unix_delete_credential, unix_enumerate_credentials, + unix_funcs_count }; #define MOUNTMGR_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

1 0