September 2023 - Wine-commits

Biswapriyo Nath : include: Add Windows.Media.Effects.AudioEffect runtimeclass.
by Alexandre Julliard 01 Sep '23

01 Sep '23

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: Remove some workarounds for old Windows versions.
by Alexandre Julliard 01 Sep '23

01 Sep '23

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

Alexandre Julliard : kernel32/tests: Fix alignment issues on 64-bit.
by Alexandre Julliard 01 Sep '23

01 Sep '23

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: Make the generated dlls relocatable.
by Alexandre Julliard 01 Sep '23

01 Sep '23

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

Alexandre Julliard : kernel32/tests: Remove tests for the exact value of the stack pointer.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: d3dfed51b37838855c6bcd352a631cc87a4dac6b URL: https://gitlab.winehq.org/wine/wine/-/commit/d3dfed51b37838855c6bcd352a631c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 16:01:57 2023 +0200 kernel32/tests: Remove tests for the exact value of the stack pointer. Stack pointer is randomized on Windows. --- dlls/kernel32/tests/process.c | 4 ---- dlls/kernel32/tests/thread.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b80e7ec5ef8..dfb47a84745 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3276,8 +3276,6 @@ static void test_SuspendProcessNewThread(void) } ok( ctx.Eax == (ULONG_PTR)exit_thread_ptr, "wrong eax %08lx/%p\n", ctx.Eax, exit_thread_ptr ); ok( ctx.Ebx == 0x1234, "wrong ebx %08lx\n", ctx.Ebx ); - ok( !((ctx.Esp + 0x10) & 0xfff) || broken( !((ctx.Esp + 4) & 0xfff) ), /* winxp, w2k3 */ - "esp is not at top of stack page or properly aligned: %08lx\n", ctx.Esp ); ok( (ctx.EFlags & ~2) == 0x200, "wrong flags %08lx\n", ctx.EFlags ); ok( (WORD)ctx.FloatSave.ControlWord == 0x27f, "wrong control %08lx\n", ctx.FloatSave.ControlWord ); ok( *(WORD *)ctx.ExtendedRegisters == 0x27f, "wrong control %08x\n", *(WORD *)ctx.ExtendedRegisters ); @@ -3442,8 +3440,6 @@ static void test_SuspendProcessState(void) ok( !ctx.Esi, "esi is not zero %08lx\n", ctx.Esi ); ok( !ctx.Edi, "edi is not zero %08lx\n", ctx.Edi ); } - ok( !((ctx.Esp + 0x10) & 0xfff) || broken( !((ctx.Esp + 4) & 0xfff) ), /* winxp, w2k3 */ - "esp is not at top of stack page or properly aligned: %08lx\n", ctx.Esp ); ok( (ctx.EFlags & ~2) == 0x200, "wrong flags %08lx\n", ctx.EFlags ); ok( (WORD)ctx.FloatSave.ControlWord == 0x27f, "wrong control %08lx\n", ctx.FloatSave.ControlWord ); ok( *(WORD *)ctx.ExtendedRegisters == 0x27f, "wrong control %08x\n", *(WORD *)ctx.ExtendedRegisters ); diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 4addff1e199..9925da32222 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1187,9 +1187,6 @@ static DWORD WINAPI test_stack( void *arg ) ok( stack == NtCurrentTeb()->Tib.StackBase, "wrong stack %p/%p\n", stack, NtCurrentTeb()->Tib.StackBase ); ok( !stack[-1], "wrong data %p = %08lx\n", stack - 1, stack[-1] ); - ok( stack[-2] == (DWORD)arg, "wrong data %p = %08lx\n", stack - 2, stack[-2] ); - ok( stack[-3] == (DWORD)test_stack, "wrong data %p = %08lx\n", stack - 3, stack[-3] ); - ok( !stack[-4], "wrong data %p = %08lx\n", stack - 4, stack[-4] ); return 0; }

1 0

Alexandre Julliard : ntdll/tests: Fix alignment issues on 64-bit.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: e33cd0d18aa24bc371018a21c7f2242e3899858e URL: https://gitlab.winehq.org/wine/wine/-/commit/e33cd0d18aa24bc371018a21c7f224… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 16:07:10 2023 +0200 ntdll/tests: Fix alignment issues on 64-bit. --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a67c987a8c2..f54fb31efda 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2247,7 +2247,7 @@ static void test_token(void) static void *align_ptr( void *ptr ) { - ULONG align = sizeof(DWORD_PTR) - 1; + ULONG_PTR align = sizeof(DWORD_PTR) - 1; return (void *)(((DWORD_PTR)ptr + align) & ~align); }

1 0

Alexandre Julliard : ntdll/tests: Allow more invalid length values on Windows.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: 5bd5fecbeb3ef50292a38f0265381ea13acc0f82 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bd5fecbeb3ef50292a38f0265381e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 16:08:16 2023 +0200 ntdll/tests: Allow more invalid length values on Windows. --- dlls/ntdll/tests/info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ed3e0360c86..e19d4adee7f 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2079,21 +2079,21 @@ static void test_query_process_debug_port(int argc, char **argv) status = NtQueryInformationProcess(NULL, ProcessDebugPort, &debug_port, sizeof(debug_port), &len); ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status); - ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */ + ok(len == 0xdeadbeef || broken(len != sizeof(debug_port)), /* wow64 */ "len set to %lx\n", len ); len = 0xdeadbeef; status = NtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port) - 1, &len); ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); - ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */ + ok(len == 0xdeadbeef || broken(len != sizeof(debug_port)), /* wow64 */ "len set to %lx\n", len ); len = 0xdeadbeef; status = NtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port) + 1, &len); ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); - ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */ + ok(len == 0xdeadbeef || broken(len != sizeof(debug_port)), /* wow64 */ "len set to %lx\n", len ); len = 0xdeadbeef;

1 0

Alexandre Julliard : ntdll/tests: Work around a Windows pointer truncation bug in CPU info.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: ff1dfb42b9675cd8d4920a5a37d3db7163fa8e79 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff1dfb42b9675cd8d4920a5a37d3db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 17:01:20 2023 +0200 ntdll/tests: Work around a Windows pointer truncation bug in CPU info. --- dlls/ntdll/tests/exception.c | 6 ++++++ dlls/ntdll/tests/wow64.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 19aa9992c2d..cdfa4b026b8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4350,6 +4350,12 @@ static void test_wow64_context(void) ok( cpu->Machine == IMAGE_FILE_MACHINE_I386, "wrong machine %04x\n", cpu->Machine ); ret = pRtlWow64GetCpuAreaInfo( cpu, 0, &cpu_info ); ok( !ret, "RtlWow64GetCpuAreaInfo failed %lx\n", ret ); + /* work around pointer truncation bug on win10 <= 1709 */ + if (!((ULONG_PTR)cpu_info.Context >> 32)) + { + cpu_info.Context = (char *)cpu + (ULONG)((char *)cpu_info.Context - (char *)cpu); + cpu_info.ContextEx = (char *)cpu + (ULONG)((char *)cpu_info.ContextEx - (char *)cpu); + } ctx_ptr = (WOW64_CONTEXT *)cpu_info.Context; ok(!*(void **)cpu_info.ContextEx, "got context_ex %p\n", *(void **)cpu_info.ContextEx); ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx_ptr->ContextFlags); diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 485b9006b14..4e9107ded9d 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1340,8 +1340,10 @@ static void test_cpu_area(void) status = pRtlWow64GetCpuAreaInfo( cpu, 0, &info ); ok( status == tests[i].expect, "%lu:%lu: failed %lx\n", i, j, status ); if (status) continue; - ok( info.Context == ALIGN( cpu + 1, tests[i].align ), "%lu:%lu: wrong offset %lu\n", - i, j, (ULONG)((char *)info.Context - (char *)cpu) ); + ok( info.Context == ALIGN( cpu + 1, tests[i].align ) || + broken( (ULONG_PTR)info.Context == (ULONG)(ULONG_PTR)ALIGN( cpu + 1, tests[i].align ) ), /* win10 <= 1709 */ + "%lu:%lu: wrong offset %Iu cpu %p context %p\n", + i, j, (ULONG_PTR)((char *)info.Context - (char *)cpu), cpu, info.Context ); ok( info.ContextEx == ALIGN( (char *)info.Context + tests[i].size, sizeof(void*) ), "%lu:%lu: wrong ex offset %lu\n", i, j, (ULONG)((char *)info.ContextEx - (char *)cpu) ); ok( info.ContextFlagsLocation == (char *)info.Context + tests[i].offset,

1 0

Alexandre Julliard : oleaut32/tests: Fix a pointer truncation issue on 64-bit.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: ab959b91cd029972dc1d2a40064f7e70c63dbdcf URL: https://gitlab.winehq.org/wine/wine/-/commit/ab959b91cd029972dc1d2a40064f7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 17:07:26 2023 +0200 oleaut32/tests: Fix a pointer truncation issue on 64-bit. --- dlls/oleaut32/tests/usrmarshal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index fee8097fac8..bb08ba1a1e3 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1625,8 +1625,7 @@ static void test_marshal_VARIANT(void) wirev = (DWORD*)buffer; wirev = check_variant_header(wirev, &v, next - buffer); - ok(*wirev == (DWORD_PTR)V_UNKNOWN(&v) /* Win9x */ || - *wirev == (DWORD_PTR)V_UNKNOWN(&v) + 1 /* NT */, "wv[5] %08lx\n", *wirev); + ok(*wirev == (DWORD)(DWORD_PTR)V_UNKNOWN(&v) + 1, "wv[5] %08lx\n", *wirev); wirev++; ok(*wirev == next - buffer - 0x20, "wv[6] %08lx\n", *wirev); wirev++; @@ -1694,8 +1693,7 @@ static void test_marshal_VARIANT(void) ok(*wirev == 4, "wv[5] %08lx\n", *wirev); wirev++; - ok(*wirev == (DWORD_PTR)heap_unknown /* Win9x, Win2000 */ || - *wirev == (DWORD_PTR)heap_unknown + 1 /* XP */, "wv[6] %08lx\n", *wirev); + ok(*wirev == (DWORD)(DWORD_PTR)heap_unknown + 1, "wv[6] %08lx\n", *wirev); wirev++; ok(*wirev == next - buffer - 0x24, "wv[7] %08lx\n", *wirev); wirev++;

1 0

Alexandre Julliard : winmm/tests: Fix a pointer truncation issue on 64-bit.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: 863c57e956fffaef97b8ff5acf581a8e863b1331 URL: https://gitlab.winehq.org/wine/wine/-/commit/863c57e956fffaef97b8ff5acf581a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 17:40:21 2023 +0200 winmm/tests: Fix a pointer truncation issue on 64-bit. --- dlls/winmm/tests/wave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index c0c22bee4d8..608bcaa3118 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -687,7 +687,7 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); /* waveOutGetDevCaps allows an open handle instead of a device id */ - rc=waveOutGetDevCapsW(HandleToUlong(wout),&capsW,sizeof(capsW)); + rc=waveOutGetDevCapsW((UINT_PTR)wout,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR, "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR " "expected, got %s\n",dev_name(device),wave_out_error(rc));

1 0