May 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Add a helper function to process MEM_EXTENDED_PARAMETER parameters.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 185e168accf0e31044d2c25c98376fca9e143e42 URL: https://gitlab.winehq.org/wine/wine/-/commit/185e168accf0e31044d2c25c98376f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 17:05:34 2023 +0200 ntdll: Add a helper function to process MEM_EXTENDED_PARAMETER parameters. --- dlls/ntdll/unix/virtual.c | 60 ++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8154ff148eb..5c746df9693 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4041,22 +4041,11 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z } -/*********************************************************************** - * NtAllocateVirtualMemoryEx (NTDLL.@) - * ZwAllocateVirtualMemoryEx (NTDLL.@) - */ -NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, - ULONG protect, MEM_EXTENDED_PARAMETER *parameters, - ULONG count ) +static NTSTATUS get_extended_params( const MEM_EXTENDED_PARAMETER *parameters, ULONG count, + ULONG_PTR *limit, ULONG_PTR *align, ULONG *attributes ) { - ULONG_PTR limit = 0; - ULONG_PTR align = 0; - ULONG attributes = 0; MEM_ADDRESS_REQUIREMENTS *r = NULL; - unsigned int i; - - TRACE( "%p %p %08lx %x %08x %p %u\n", - process, *ret, *size_ptr, (int)type, (int)protect, parameters, (int)count ); + ULONG i; if (count && !parameters) return STATUS_INVALID_PARAMETER; @@ -4074,25 +4063,26 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s if (r->Alignment) { - if (*ret || (r->Alignment & (r->Alignment - 1)) || r->Alignment - 1 < granularity_mask) + if ((r->Alignment & (r->Alignment - 1)) || r->Alignment - 1 < granularity_mask) { WARN( "Invalid alignment %lu.\n", r->Alignment ); return STATUS_INVALID_PARAMETER; } - align = r->Alignment; + *align = r->Alignment; } - - limit = (ULONG_PTR)r->HighestEndingAddress; - if (limit && (*ret || limit > (ULONG_PTR)user_space_limit || ((limit + 1) & (page_mask - 1)))) + if (r->HighestEndingAddress) { - WARN( "Invalid limit %p.\n", r->HighestEndingAddress); - return STATUS_INVALID_PARAMETER; + *limit = (ULONG_PTR)r->HighestEndingAddress; + if (*limit > (ULONG_PTR)user_space_limit || ((*limit + 1) & (page_mask - 1))) + { + WARN( "Invalid limit %p.\n", r->HighestEndingAddress ); + return STATUS_INVALID_PARAMETER; + } } - TRACE( "limit %p, align %p.\n", (void *)limit, (void *)align ); break; case MemExtendedParameterAttributeFlags: - attributes = parameters[i].ULong; + *attributes = parameters[i].ULong; break; case MemExtendedParameterNumaNode: @@ -4107,14 +4097,36 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s return STATUS_INVALID_PARAMETER; } } + return STATUS_SUCCESS; +} + +/*********************************************************************** + * NtAllocateVirtualMemoryEx (NTDLL.@) + * ZwAllocateVirtualMemoryEx (NTDLL.@) + */ +NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, + ULONG count ) +{ + ULONG_PTR limit = 0; + ULONG_PTR align = 0; + ULONG attributes = 0; + unsigned int status; + + TRACE( "%p %p %08lx %x %08x %p %u\n", + process, *ret, *size_ptr, (int)type, (int)protect, parameters, (int)count ); + + status = get_extended_params( parameters, count, &limit, &align, &attributes ); + if (status) return status; + + if (*ret && (align || limit)) return STATUS_INVALID_PARAMETER; if (!*size_ptr) return STATUS_INVALID_PARAMETER; if (process != NtCurrentProcess()) { apc_call_t call; apc_result_t result; - unsigned int status; memset( &call, 0, sizeof(call) );

1 0

Alexandre Julliard : ntdll: Support extended address requirements in NtMapViewOfSectionEx().
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 4b8f3dd9a56db4fd6a63895f7ee6ee26c1ef2bc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b8f3dd9a56db4fd6a63895f7ee6ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 17:07:08 2023 +0200 ntdll: Support extended address requirements in NtMapViewOfSectionEx(). --- dlls/ntdll/unix/server.c | 39 ++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 63 ++++++++++++++++++++++++++++++++++++++---- include/wine/server_protocol.h | 21 +++++++++++++- server/protocol.def | 21 +++++++++++++- server/thread.c | 1 + server/trace.c | 12 ++++++-- 6 files changed, 148 insertions(+), 9 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Add tests for address requirements in NtMapViewOfSectionEx().
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 9099289aff083abedd2ab36cbe59c6164e072f05 URL: https://gitlab.winehq.org/wine/wine/-/commit/9099289aff083abedd2ab36cbe59c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 17:07:38 2023 +0200 ntdll/tests: Add tests for address requirements in NtMapViewOfSectionEx(). Based on the similar tests for NtAllocateVirtualMemoryEx(). --- dlls/ntdll/tests/virtual.c | 120 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 425d02473ba..bfd27f498e2 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -490,7 +490,8 @@ static void test_NtAllocateVirtualMemoryEx(void) } } #endif - ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + ok(status == STATUS_INVALID_PARAMETER || status == STATUS_NOT_SUPPORTED, + "Unexpected status %08lx.\n", status); } static void test_NtAllocateVirtualMemoryEx_address_requirements(void) @@ -1370,6 +1371,9 @@ static void test_NtMapViewOfSectionEx(void) static const char testfile[] = "testfile.xxx"; static const char data[] = "test data for NtMapViewOfSectionEx"; char buffer[sizeof(data)]; + MEM_EXTENDED_PARAMETER ext[2]; + MEM_ADDRESS_REQUIREMENTS a; + SYSTEM_INFO si; HANDLE file, mapping, process; DWORD status, written; SIZE_T size, result; @@ -1384,23 +1388,24 @@ static void test_NtMapViewOfSectionEx(void) } if (!pIsWow64Process || !pIsWow64Process(NtCurrentProcess(), &is_wow64)) is_wow64 = FALSE; + GetSystemInfo(&si); file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Failed to create test file\n"); WriteFile(file, data, sizeof(data), &written, NULL); - SetFilePointer(file, 4096, NULL, FILE_BEGIN); + SetFilePointer(file, 0x40000, NULL, FILE_BEGIN); SetEndOfFile(file); /* read/write mapping */ - mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, 4096, NULL); + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, 0x40000, NULL); ok(mapping != 0, "CreateFileMapping failed\n"); process = create_target_process("sleep"); ok(process != NULL, "Can't start process\n"); ptr = NULL; - size = 0; + size = 0x1000; offset.QuadPart = 0; status = pNtMapViewOfSectionEx(mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, NULL, 0); ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); @@ -1443,20 +1448,20 @@ static void test_NtMapViewOfSectionEx(void) { /* new memory region conflicts with previous mapping */ ptr2 = ptr; - size = 0; + size = 0x1000; offset.QuadPart = 0; status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status); ptr2 = (char *)ptr + 42; - size = 0; + size = 0x1000; offset.QuadPart = 0; status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status); /* in contrary to regular NtMapViewOfSection, only 4kb align is enforced */ ptr2 = (char *)ptr + 0x1000; - size = 0; + size = 0x1000; offset.QuadPart = 0; status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); @@ -1467,7 +1472,7 @@ static void test_NtMapViewOfSectionEx(void) /* the address is rounded down if not on a page boundary */ ptr2 = (char *)ptr + 0x1001; - size = 0; + size = 0x1000; offset.QuadPart = 0; status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); @@ -1477,7 +1482,7 @@ static void test_NtMapViewOfSectionEx(void) ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); ptr2 = (char *)ptr + 0x2000; - size = 0; + size = 0x1000; offset.QuadPart = 0; status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); @@ -1500,6 +1505,103 @@ static void test_NtMapViewOfSectionEx(void) status = NtUnmapViewOfSection(process, ptr); ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + /* extended parameters */ + + memset(&ext, 0, sizeof(ext)); + ext[0].Type = 0; + size = 0x1000; + ptr = NULL; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + memset(&ext, 0, sizeof(ext)); + ext[0].Type = MemExtendedParameterMax; + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + memset(&a, 0, sizeof(a)); + ext[0].Type = MemExtendedParameterAddressRequirements; + ext[0].Pointer = &a; + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(!status, "Unexpected status %08lx.\n", status); + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + ext[1] = ext[0]; + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 2 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.LowestStartingAddress = NULL; + a.Alignment = 0; + a.HighestEndingAddress = (void *)(0x20001000 + 1); + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (void *)(0x20001000 - 2); + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (void *)(0x20000800 - 1); + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (char *)si.lpMaximumApplicationAddress + 0x1000; + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (char *)si.lpMaximumApplicationAddress; + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(!status, "Unexpected status %08lx.\n", status); + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + a.HighestEndingAddress = (void *)(0x20001000 - 1); + size = 0x40000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(!status, "Unexpected status %08lx.\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "Unexpected addr %p.\n", ptr); + ok((ULONG_PTR)ptr + size <= 0x20001000, "Unexpected addr %p.\n", ptr); + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + size = 0x40000; + a.HighestEndingAddress = (void *)(0x20001000 - 1); + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = NULL; + a.Alignment = 0x30000; + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + for (a.Alignment = 1; a.Alignment; a.Alignment *= 2) + { + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Align %Ix unexpected status %08lx.\n", a.Alignment, status); + } + NtClose(mapping); CloseHandle(file);

1 0

Alexandre Julliard : wow64: Add a helper function to convert MEM_EXTENDED_PARAMETER.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: e0311411786c85a560b6f9969a7adf1f544982ab URL: https://gitlab.winehq.org/wine/wine/-/commit/e0311411786c85a560b6f9969a7adf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 18:18:21 2023 +0200 wow64: Add a helper function to convert MEM_EXTENDED_PARAMETER. And use the correct 32-bit types for the conversion. --- dlls/wow64/struct32.h | 23 ++++++++-- dlls/wow64/virtual.c | 122 +++++++++++++++++++++++++------------------------- 2 files changed, 82 insertions(+), 63 deletions(-) diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 76308a7f659..0a560ac0f92 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -667,9 +667,26 @@ typedef struct typedef struct { - ULONG LowestStartingAddress; - ULONG HighestEndingAddress; - ULONG Alignment; + ULONG LowestStartingAddress; + ULONG HighestEndingAddress; + ULONG Alignment; } MEM_ADDRESS_REQUIREMENTS32; +typedef struct DECLSPEC_ALIGN(8) +{ + struct + { + DWORD64 Type : MEM_EXTENDED_PARAMETER_TYPE_BITS; + DWORD64 Reserved : 64 - MEM_EXTENDED_PARAMETER_TYPE_BITS; + }; + union + { + DWORD64 ULong64; + ULONG Pointer; + ULONG Size; + ULONG Handle; + ULONG ULong; + }; +} MEM_EXTENDED_PARAMETER32; + #endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 0f34e8aec27..e58ae805914 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -48,6 +48,64 @@ static MEMORY_RANGE_ENTRY *memory_range_entry_array_32to64( const MEMORY_RANGE_E return addresses; } +static NTSTATUS mem_extended_parameters_32to64( MEM_EXTENDED_PARAMETER **ret_params, + const MEM_EXTENDED_PARAMETER32 *params32, ULONG *count, + BOOL set_limit ) +{ + ULONG i; + MEM_EXTENDED_PARAMETER *params; + MEM_ADDRESS_REQUIREMENTS *req; + MEM_ADDRESS_REQUIREMENTS32 *req32 = NULL; + + if (*count && !params32) return STATUS_INVALID_PARAMETER; + + params = Wow64AllocateTemp( (*count + 1) * sizeof(*params) + sizeof(*req) ); + req = (MEM_ADDRESS_REQUIREMENTS *)(params + *count + 1); + + for (i = 0; i < *count; i++) + { + params[i].Type = params32[i].Type; + params[i].Reserved = 0; + switch (params[i].Type) + { + case MemExtendedParameterAddressRequirements: + req32 = ULongToPtr( params32[i].Pointer ); + params[i].Pointer = req; + break; + case MemExtendedParameterAttributeFlags: + case MemExtendedParameterNumaNode: + case MemExtendedParameterImageMachine: + params[i].ULong = params32[i].ULong; + break; + case MemExtendedParameterPartitionHandle: + case MemExtendedParameterUserPhysicalHandle: + params[i].Handle = ULongToHandle( params32[i].Handle ); + break; + } + } + + if (req32) + { + if (req32->HighestEndingAddress > highest_user_address) return STATUS_INVALID_PARAMETER; + req->LowestStartingAddress = ULongToPtr( req32->LowestStartingAddress ); + req->HighestEndingAddress = ULongToPtr( req32->HighestEndingAddress ); + req->Alignment = req32->Alignment; + } + else if (set_limit) + { + req->LowestStartingAddress = NULL; + req->HighestEndingAddress = (void *)highest_user_address; + req->Alignment = 0; + + params[i].Type = MemExtendedParameterAddressRequirements; + params[i].Reserved = 0; + params[i].Pointer = req; + *count = i + 1; + } + *ret_params = params; + return STATUS_SUCCESS; +} + /********************************************************************** * wow64_NtAllocateVirtualMemory */ @@ -85,75 +143,19 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) ULONG *size32 = get_ptr( &args ); ULONG type = get_ulong( &args ); ULONG protect = get_ulong( &args ); - MEM_EXTENDED_PARAMETER *params = get_ptr( &args ); + MEM_EXTENDED_PARAMETER32 *params32 = get_ptr( &args ); ULONG count = get_ulong( &args ); void *addr; SIZE_T size; NTSTATUS status; - SIZE_T alloc_size = count * sizeof(*params); MEM_EXTENDED_PARAMETER *params64; - BOOL set_highest_address = (!*addr32 && process == GetCurrentProcess()); - BOOL add_address_requirements = set_highest_address; - MEM_ADDRESS_REQUIREMENTS *buf; - unsigned int i; - - if (count && !params) return STATUS_INVALID_PARAMETER; - - for (i = 0; i < count; ++i) - { - if (params[i].Type == MemExtendedParameterAddressRequirements) - { - alloc_size += sizeof(MEM_ADDRESS_REQUIREMENTS); - add_address_requirements = FALSE; - } - else if (params[i].Type && params[i].Type < MemExtendedParameterMax) - { - FIXME( "Unsupported parameter type %d.\n", params[i].Type); - } - } + BOOL set_limit = (!*addr32 && process == GetCurrentProcess()); - if (add_address_requirements) - alloc_size += sizeof(*params) + sizeof(MEM_ADDRESS_REQUIREMENTS); - params64 = Wow64AllocateTemp( alloc_size ); - memcpy( params64, params, count * sizeof(*params64) ); - if (add_address_requirements) - { - buf = (MEM_ADDRESS_REQUIREMENTS *)((char *)params64 + (count + 1) * sizeof(*params64)); - params64[count].Type = MemExtendedParameterAddressRequirements; - params64[count].Pointer = buf; - memset(buf, 0, sizeof(*buf)); - buf->HighestEndingAddress = (void *)highest_user_address; - ++buf; - } - else - { - buf = (MEM_ADDRESS_REQUIREMENTS *)((char *)params64 + count * sizeof(*params64)); - } - for (i = 0; i < count; ++i) - { - if (params64[i].Type == MemExtendedParameterAddressRequirements) - { - MEM_ADDRESS_REQUIREMENTS32 *p = (MEM_ADDRESS_REQUIREMENTS32 *)params[i].Pointer; - - buf->LowestStartingAddress = ULongToPtr(p->LowestStartingAddress); - if (p->HighestEndingAddress) - { - if (p->HighestEndingAddress > highest_user_address) return STATUS_INVALID_PARAMETER; - buf->HighestEndingAddress = ULongToPtr(p->HighestEndingAddress); - } - else - { - buf->HighestEndingAddress = set_highest_address ? (void *)highest_user_address : NULL; - } - buf->Alignment = p->Alignment; - params64[i].Pointer = buf; - ++buf; - } - } + if ((status = mem_extended_parameters_32to64( &params64, params32, &count, set_limit ))) return status; status = NtAllocateVirtualMemoryEx( process, addr_32to64( &addr, addr32 ), size_32to64( &size, size32 ), - type, protect, params64, count + add_address_requirements ); + type, protect, params64, count ); if (!status) { put_addr( addr32, addr );

1 0

Alexandre Julliard : wow64: Convert MEM_EXTENDED_PARAMETER also for NtMapViewOfSectionEx().
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: f0a6c3f6bc908d1f389348730edc353bc8c257a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0a6c3f6bc908d1f389348730edc35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 18:20:40 2023 +0200 wow64: Convert MEM_EXTENDED_PARAMETER also for NtMapViewOfSectionEx(). --- dlls/wow64/virtual.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e58ae805914..21ce0905654 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -375,15 +375,19 @@ NTSTATUS WINAPI wow64_NtMapViewOfSectionEx( UINT *args ) ULONG *size32 = get_ptr( &args ); ULONG alloc = get_ulong( &args ); ULONG protect = get_ulong( &args ); - MEM_EXTENDED_PARAMETER *params = get_ptr( &args ); - ULONG params_count = get_ulong( &args ); + MEM_EXTENDED_PARAMETER32 *params32 = get_ptr( &args ); + ULONG count = get_ulong( &args ); void *addr; SIZE_T size; NTSTATUS status; + MEM_EXTENDED_PARAMETER *params64; + BOOL set_limit = (!*addr32 && process == GetCurrentProcess()); + + if ((status = mem_extended_parameters_32to64( &params64, params32, &count, set_limit ))) return status; - status = NtMapViewOfSectionEx( handle, process, addr_32to64( &addr, addr32 ), offset, size_32to64( &size, size32 ), alloc, - protect, params, params_count ); + status = NtMapViewOfSectionEx( handle, process, addr_32to64( &addr, addr32 ), offset, + size_32to64( &size, size32 ), alloc, protect, params64, count ); if (NT_SUCCESS(status)) { SECTION_IMAGE_INFORMATION info;

1 0

Davide Beatrici : winepulse: Move AudioStreamVolume into mmdevapi.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 7244666dc96a929090c68e24b482950fd65ab7db URL: https://gitlab.winehq.org/wine/wine/-/commit/7244666dc96a929090c68e24b48295… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 9 21:36:07 2023 +0200 winepulse: Move AudioStreamVolume into mmdevapi. --- dlls/mmdevapi/Makefile.in | 1 + dlls/mmdevapi/client.c | 208 +++++++++++++++++++++++++++++++++++++++++ dlls/mmdevapi/session.c | 25 +++-- dlls/winepulse.drv/Makefile.in | 1 + dlls/winepulse.drv/mmdevdrv.c | 168 +-------------------------------- 5 files changed, 223 insertions(+), 180 deletions(-)

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioStreamVolume.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 844cf46d169feda4ac2713b5f245bf530c570f32 URL: https://gitlab.winehq.org/wine/wine/-/commit/844cf46d169feda4ac2713b5f245bf… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 9 09:09:31 2023 +0200 winealsa: Use mmdevapi's AudioStreamVolume. --- dlls/winealsa.drv/Makefile.in | 1 + dlls/winealsa.drv/mmdevdrv.c | 161 +----------------------------------------- 2 files changed, 2 insertions(+), 160 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 39e378cb7df..9494858c4dd 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -8,6 +8,7 @@ UNIX_LIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) C_SRCS = \ alsa.c \ alsamidi.c \ + client.c \ midi.c \ mmdevdrv.c \ session.c diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3952d2e6718..ec50c856e38 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -76,7 +76,7 @@ extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; static const IAudioClockVtbl AudioClock_Vtbl; static const IAudioClock2Vtbl AudioClock2_Vtbl; -static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; +extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); @@ -116,11 +116,6 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } -static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioStreamVolume_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1500,160 +1495,6 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) return ret; } -static HRESULT WINAPI AudioStreamVolume_QueryInterface( - IAudioStreamVolume *iface, REFIID riid, void **ppv) -{ - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioStreamVolume)) - *ppv = iface; - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioStreamVolume_GetChannelCount( - IAudioStreamVolume *iface, UINT32 *out) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%p)\n", This, out); - - if(!out) - return E_POINTER; - - *out = This->channel_count; - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( - IAudioStreamVolume *iface, UINT32 index, float level) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%d, %f)\n", This, index, level); - - if(level < 0.f || level > 1.f) - return E_INVALIDARG; - - if(index >= This->channel_count) - return E_INVALIDARG; - - TRACE("ALSA does not support volume control\n"); - - sessions_lock(); - - This->vols[index] = level; - set_stream_volumes(This); - - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( - IAudioStreamVolume *iface, UINT32 index, float *level) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%d, %p)\n", This, index, level); - - if(!level) - return E_POINTER; - - if(index >= This->channel_count) - return E_INVALIDARG; - - *level = This->vols[index]; - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( - IAudioStreamVolume *iface, UINT32 count, const float *levels) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - unsigned int i; - - TRACE("(%p)->(%d, %p)\n", This, count, levels); - - if(!levels) - return E_POINTER; - - if(count != This->channel_count) - return E_INVALIDARG; - - TRACE("ALSA does not support volume control\n"); - - sessions_lock(); - - for(i = 0; i < count; ++i) - This->vols[i] = levels[i]; - set_stream_volumes(This); - - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( - IAudioStreamVolume *iface, UINT32 count, float *levels) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - unsigned int i; - - TRACE("(%p)->(%d, %p)\n", This, count, levels); - - if(!levels) - return E_POINTER; - - if(count != This->channel_count) - return E_INVALIDARG; - - sessions_lock(); - - for(i = 0; i < count; ++i) - levels[i] = This->vols[i]; - - sessions_unlock(); - - return S_OK; -} - -static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl = -{ - AudioStreamVolume_QueryInterface, - AudioStreamVolume_AddRef, - AudioStreamVolume_Release, - AudioStreamVolume_GetChannelCount, - AudioStreamVolume_SetChannelVolume, - AudioStreamVolume_GetChannelVolume, - AudioStreamVolume_SetAllVolumes, - AudioStreamVolume_GetAllVolumes -}; - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) {

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioStreamVolume.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: d8b098dbde210895feb7b60e49ce8caea48f8b3a URL: https://gitlab.winehq.org/wine/wine/-/commit/d8b098dbde210895feb7b60e49ce8c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 9 06:34:24 2023 +0200 winecoreaudio: Use mmdevapi's AudioStreamVolume. --- dlls/winecoreaudio.drv/Makefile.in | 1 + dlls/winecoreaudio.drv/mmdevdrv.c | 159 +------------------------------------ 2 files changed, 2 insertions(+), 158 deletions(-) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 8b40ab19afe..01c5a3d0073 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -6,6 +6,7 @@ DELAYIMPORTS = winmm UNIX_LIBS = $(COREAUDIO_LIBS) C_SRCS = \ + client.c \ coreaudio.c \ coremidi.c \ midi.c \ diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 835bfc6978e..7f7bb0ecfbb 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -58,7 +58,7 @@ extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; static const IAudioClockVtbl AudioClock_Vtbl; static const IAudioClock2Vtbl AudioClock2_Vtbl; -static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; +extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static WCHAR drv_key_devicesW[256]; @@ -110,11 +110,6 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } -static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioStreamVolume_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1450,158 +1445,6 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) return ret; } -static HRESULT WINAPI AudioStreamVolume_QueryInterface( - IAudioStreamVolume *iface, REFIID riid, void **ppv) -{ - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioStreamVolume)) - *ppv = iface; - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioStreamVolume_GetChannelCount( - IAudioStreamVolume *iface, UINT32 *out) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%p)\n", This, out); - - if(!out) - return E_POINTER; - - *out = This->channel_count; - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( - IAudioStreamVolume *iface, UINT32 index, float level) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%d, %f)\n", This, index, level); - - if(level < 0.f || level > 1.f) - return E_INVALIDARG; - - if(index >= This->channel_count) - return E_INVALIDARG; - - sessions_lock(); - - This->vols[index] = level; - - set_stream_volumes(This); - - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( - IAudioStreamVolume *iface, UINT32 index, float *level) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%d, %p)\n", This, index, level); - - if(!level) - return E_POINTER; - - if(index >= This->channel_count) - return E_INVALIDARG; - - *level = This->vols[index]; - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( - IAudioStreamVolume *iface, UINT32 count, const float *levels) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - UINT32 i; - - TRACE("(%p)->(%d, %p)\n", This, count, levels); - - if(!levels) - return E_POINTER; - - if(count != This->channel_count) - return E_INVALIDARG; - - sessions_lock(); - - for(i = 0; i < count; ++i) - This->vols[i] = levels[i]; - - set_stream_volumes(This); - - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( - IAudioStreamVolume *iface, UINT32 count, float *levels) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - UINT32 i; - - TRACE("(%p)->(%d, %p)\n", This, count, levels); - - if(!levels) - return E_POINTER; - - if(count != This->channel_count) - return E_INVALIDARG; - - sessions_lock(); - - for(i = 0; i < count; ++i) - levels[i] = This->vols[i]; - - sessions_unlock(); - - return S_OK; -} - -static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl = -{ - AudioStreamVolume_QueryInterface, - AudioStreamVolume_AddRef, - AudioStreamVolume_Release, - AudioStreamVolume_GetChannelCount, - AudioStreamVolume_SetChannelVolume, - AudioStreamVolume_GetChannelVolume, - AudioStreamVolume_SetAllVolumes, - AudioStreamVolume_GetAllVolumes -}; - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) {

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioStreamVolume.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 018516729b8a3cc5959fafb51e4863ea8cc63d8c URL: https://gitlab.winehq.org/wine/wine/-/commit/018516729b8a3cc5959fafb51e4863… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 9 21:36:47 2023 +0200 wineoss: Use mmdevapi's AudioStreamVolume. --- dlls/mmdevapi/client.c | 12 +++- dlls/mmdevapi/session.c | 12 +--- dlls/wineoss.drv/Makefile.in | 1 + dlls/wineoss.drv/mmdevdrv.c | 156 +------------------------------------------ 4 files changed, 14 insertions(+), 167 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index c7cf577432a..312bc462c3b 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -36,7 +36,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern void sessions_lock(void) DECLSPEC_HIDDEN; extern void sessions_unlock(void) DECLSPEC_HIDDEN; -extern void set_stream_volumes(struct audio_client *This) DECLSPEC_HIDDEN; +void set_stream_volumes(struct audio_client *This) +{ + struct set_volumes_params params; + + params.stream = This->stream; + params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); + params.volumes = This->vols; + params.session_volumes = This->session->channel_vols; + + WINE_UNIX_CALL(set_volumes, &params); +} static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) { diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index 9c1b87a229b..81cea5b3482 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -33,17 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern void sessions_lock(void) DECLSPEC_HIDDEN; extern void sessions_unlock(void) DECLSPEC_HIDDEN; -void set_stream_volumes(struct audio_client *This) -{ - struct set_volumes_params params; - - params.stream = This->stream; - params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); - params.volumes = This->vols; - params.session_volumes = This->session->channel_vols; - - WINE_UNIX_CALL(set_volumes, &params); -} +extern void set_stream_volumes(struct audio_client *This) DECLSPEC_HIDDEN; static inline struct audio_session_wrapper *impl_from_IAudioSessionControl2(IAudioSessionControl2 *iface) { diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index a6e56f3065c..121595a7c6c 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -7,6 +7,7 @@ UNIX_LIBS = $(OSS4_LIBS) $(PTHREAD_LIBS) UNIX_CFLAGS = $(OSS4_CFLAGS) C_SRCS = \ + client.c \ midi.c \ midipatch.c \ mmaux.c \ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ae9d879cb02..1940750d484 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -84,7 +84,7 @@ extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; static const IAudioClockVtbl AudioClock_Vtbl; static const IAudioClock2Vtbl AudioClock2_Vtbl; -static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; +extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; void DECLSPEC_HIDDEN sessions_lock(void) @@ -1449,160 +1449,6 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) return ret; } -static HRESULT WINAPI AudioStreamVolume_QueryInterface( - IAudioStreamVolume *iface, REFIID riid, void **ppv) -{ - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioStreamVolume)) - *ppv = iface; - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioStreamVolume_GetChannelCount( - IAudioStreamVolume *iface, UINT32 *out) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%p)\n", This, out); - - if(!out) - return E_POINTER; - - *out = This->channel_count; - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( - IAudioStreamVolume *iface, UINT32 index, float level) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%d, %f)\n", This, index, level); - - if(level < 0.f || level > 1.f) - return E_INVALIDARG; - - if(index >= This->channel_count) - return E_INVALIDARG; - - sessions_lock(); - - This->vols[index] = level; - - TRACE("OSS doesn't support setting volume\n"); - set_stream_volumes(This); - - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( - IAudioStreamVolume *iface, UINT32 index, float *level) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - - TRACE("(%p)->(%d, %p)\n", This, index, level); - - if(!level) - return E_POINTER; - - if(index >= This->channel_count) - return E_INVALIDARG; - - *level = This->vols[index]; - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( - IAudioStreamVolume *iface, UINT32 count, const float *levels) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; - - TRACE("(%p)->(%d, %p)\n", This, count, levels); - - if(!levels) - return E_POINTER; - - if(count != This->channel_count) - return E_INVALIDARG; - - sessions_lock(); - - for(i = 0; i < count; ++i) - This->vols[i] = levels[i]; - - TRACE("OSS doesn't support setting volume\n"); - set_stream_volumes(This); - - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( - IAudioStreamVolume *iface, UINT32 count, float *levels) -{ - ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; - - TRACE("(%p)->(%d, %p)\n", This, count, levels); - - if(!levels) - return E_POINTER; - - if(count != This->channel_count) - return E_INVALIDARG; - - sessions_lock(); - - for(i = 0; i < count; ++i) - levels[i] = This->vols[i]; - - sessions_unlock(); - - return S_OK; -} - -static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl = -{ - AudioStreamVolume_QueryInterface, - AudioStreamVolume_AddRef, - AudioStreamVolume_Release, - AudioStreamVolume_GetChannelCount, - AudioStreamVolume_SetChannelVolume, - AudioStreamVolume_GetChannelVolume, - AudioStreamVolume_SetAllVolumes, - AudioStreamVolume_GetAllVolumes -}; - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) {

1 0

Paul Gofman : wbemprox: Bump video driver version and date.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: a6344997831f283e92a7e203534f0e3faf3cdb06 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6344997831f283e92a7e203534f0e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 14:07:18 2023 -0600 wbemprox: Bump video driver version and date. --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7c4e530a6d0..3d5b1df2466 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4191,8 +4191,8 @@ static enum fill_status fill_videocontroller( struct table *table, const struct rec->current_verticalres = vres; rec->description = wcsdup( name ); rec->device_id = L"VideoController1"; - rec->driverdate = L"20220118000000.000000-000"; - rec->driverversion = L"30.0.14023.3004"; + rec->driverdate = L"20230420000000.000000-000"; + rec->driverversion = L"31.0.14051.5006"; rec->installeddriver = get_videocontroller_installeddriver( desc.VendorId ); rec->name = wcsdup( name ); rec->pnpdevice_id = get_videocontroller_pnpdeviceid( &desc );

1 0