February 2022 - Wine-Devel - list.winehq.org

[tools 1/2] testbot/reporttest: Fix inconsistencies with the 'dll versions' block.
by Francois Gouget Feb. 18, 2022

Feb. 18, 2022

The dlls which are declared as missing or which have other 'load errors' should not have stub/test results (add placeholders to avoid future errors). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 57 +++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 6af2ff5066..debd3cec12 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -16,6 +16,8 @@ Operating system version: PlatformId=2 wProductType=1 Dll info: + activeds=dll is missing + adsldp=dll is missing advapi32=5.1.2600.5755 advpack=8.0.6001.18702 amstream=6.5.2600.5512 @@ -209,6 +211,9 @@ Dll info: xinput1_3=version error 5 xmllite=version not present 2 Test output: +----- activeds=dll is missing +----- adsldp=dll is missing + stub advapi32:cred ----- WTBS Simple test patch ----- Stubs automatically generate a successful dlls or programs test. @@ -342,6 +347,9 @@ apphelp.c:44: 2 failures in child process 0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped. apphelp:apphelp:0c9c done (3) in 0s +----- atl100=dll is missing +----- atl80=dll is missing + atl:atl_ax start dlls/atl/tests/atl_ax.c ----- WTBS Timeout after a test failure ----- Expected assessement: Timeout @@ -366,6 +374,8 @@ atl:registrar:0922 done (0) in 0s avifil32 is missing and thus no test will be run for it and no entry will be found in the test report. +----- bcrypt=dll is missing + browseui:autocomplete start dlls/browseui/tests/autocomplete.c ----- A test unit with a skipped test ----- Expected assessement: Success, 1 skipped @@ -406,6 +416,8 @@ batch.c:42: Test marked todo: Hello Wine! 0ddc:batch: 1701 tests executed (0 marked as todo, 0 failures), 0 skipped. cmd.exe:batch:0ddc done (0) in 3s +----- combase=dll is missing + comcat:comcat start dlls/comcat/tests/comcat.c ----- A test unit with a missing todo test line ----- Expected assessement: "Missing todo line" error @@ -679,6 +691,11 @@ stub crypt32:store stub crypt32:str stub cryptnet:cryptnet stub cryptui:cryptui +----- d2d1=dll is missing +----- d3d10core=dll is missing +----- d3d10_1=dll is missing +----- d3d10=dll is missing +----- d3d11=dll is missing stub d3d8:device stub d3d8:stateblock stub d3d8:visual @@ -686,8 +703,12 @@ stub d3d9:d3d9ex stub d3d9:device stub d3d9:stateblock stub d3d9:visual +----- d3dcompiler_43=dll is missing stub d3drm:d3drm stub d3drm:vector +----- d3dx10_43=dll is missing +----- d3dx11_43=dll is missing +----- d3dx9_36=dll is missing stub d3dxof:d3dxof stub ddrawex:ddrawex stub ddrawex:surface @@ -734,13 +755,17 @@ stub dsound:duplex stub dsound:propset stub dssenh:dssenh stub dswave:dswave +----- dwrite=dll is missing stub dxdiagn:container stub dxdiagn:provider +----- dxgi=dll is missing +----- explorerframe=dll is missing stub faultrep:faultrep stub fusion:asmcache stub fusion:asmenum stub fusion:asmname stub fusion:fusion +----- gameux=dll is missing stub gdi32:bitmap stub gdi32:brush stub gdi32:clipping @@ -828,6 +853,7 @@ stub mapi32:prop stub mapi32:util stub mlang:mlang stub mmcndmgr:mmcndmgr +----- mmdevapi=dll is missing stub mpr:mpr stub msacm32:msacm stub mscms:profile @@ -863,12 +889,19 @@ stub mstask:task stub mstask:task_scheduler stub mstask:task_trigger stub msvcirt:msvcirt +----- msvcp100=dll is missing +----- msvcp110=dll is missing +----- msvcp120=dll is missing +----- msvcp140=dll is missing stub msvcp60:ios stub msvcp60:string stub msvcp90:ios stub msvcp90:misc stub msvcp90:string +----- msvcr100=dll is missing +----- msvcr120=dll is missing stub msvcr90:msvcr90 +----- msvcrtd=dll is missing stub msvcrt:cpp stub msvcrt:data stub msvcrt:dir @@ -896,6 +929,7 @@ stub netapi32:apibuf stub netapi32:ds stub netapi32:wksta stub netcfgx:netcfgx +----- netprofm=dll is missing stub ntdll:atom stub ntdll:change stub ntdll:directory @@ -950,7 +984,9 @@ stub oledb32:database stub oledb32:marshal stub oledlg:main stub opengl32:opengl +----- packager=dll is missing stub pdh:pdh +----- propsys=dll is missing stub psapi:psapi_main stub qcap:qcap stub qcap:smartteefilter @@ -1034,13 +1070,16 @@ stub shlwapi:shreg stub shlwapi:string stub shlwapi:thread stub shlwapi:url +----- slc=dll is missing stub snmpapi:util stub spoolss:spoolss stub sti:sti stub sxs:cache stub sxs:name stub t2embed:t2embed +----- taskschd=dll is missing stub twain_32:dsm +----- ucrtbase=dll is missing stub urlmon:generated stub urlmon:misc stub urlmon:protocol @@ -1078,11 +1117,14 @@ stub uxtheme:system stub vbscript:createobj stub vbscript:run stub vbscript:vbscript +----- vcomp=dll is missing stub version:info stub version:install stub wbemdisp:wbemdisp stub wbemprox:query stub wbemprox:services +----- webservices=dll is missing +----- wer=dll is missing stub wiaservc:wia stub windowscodecsext:transform stub windowscodecs:bitmap @@ -1117,6 +1159,7 @@ stub winmm:mmio stub winmm:timer stub winmm:wave stub winspool.drv:info +----- wintab32=dll is missing stub wintrust:asn stub wintrust:crypt stub wintrust:register @@ -1125,13 +1168,15 @@ stub wlanapi:wlanapi stub wldap32:parse stub wmiutils:path stub wmp:oleobj -stub ws2_32:protocol -stub ws2_32:sock -stub wscript.exe:run -stub wshom.ocx:wshom -stub wsnmp32:wsnmp -stub wtsapi32:wtsapi +----- wpc=dll is native +----- ws2_32=dll is a stub +----- wscript.exe=dll is missing +----- wshom.ocx=dll is missing an ordinal +----- wsnmp32=dll is missing an entrypoint +----- wtsapi32=dll is missing the requested side-by-side version +----- xaudio2_7=load error 5 stub xcopy.exe:xcopy +stub xinput1_3:xinput stub xmllite:reader xmllite:writer start dlls/xmllite/tests/writer.c -- 2.30.2

1 1

[PATCH] dbghelp: Fix the spelling and tweak the wording of a comment.
by Francois Gouget Feb. 18, 2022

Feb. 18, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- The comment was not really clear to me so I reworded it a bit. Hopefully I understood it correctly. --- dlls/dbghelp/symbol.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 49172701405..64f376b42f0 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -66,10 +66,11 @@ int __cdecl symt_cmp_addr(const void* p1, const void* p2) /* dbghelp exposes the internal symbols/types with DWORD indexes. * - custom symbols are always stored with index starting at BASE_CUSTOM_SYMT - * - for all the others (non custom) symbols: - * + on 32bit machine, index is set to the actual adress of symt - * + on 64bit machine, we have a dedicated array to store symt exposed to caller - * index is the index in this array of the symbol + * - for all the other (non custom) symbols: + * + on 32-bit machines, index is set to the actual address of symt + * + on 64-bit machines, the symt address is stored in a dedicated array + * which is exposed to the caller and index is the index of the symbol in + * this array */ DWORD symt_ptr2index(struct module* module, const struct symt* sym) { -- 2.30.2

1 0

[PATCH] wined3d: Set a valid map pointer in adapter_gl_alloc_bo() if possible.
by Henri Verbeet Feb. 18, 2022

Feb. 18, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Adjusted commit message, otherwise unmodified. This supersedes patch 227319. dlls/wined3d/adapter_gl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cb0c34823aa..4e93e25452d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4646,6 +4646,18 @@ static bool adapter_gl_alloc_bo(struct wined3d_device *device, struct wined3d_re return false; } + if (bo_gl->memory) + { + struct wined3d_allocator_chunk_gl *chunk = wined3d_allocator_chunk_gl(bo_gl->memory->chunk); + + wined3d_allocator_chunk_gl_lock(chunk); + + if ((bo_gl->b.map_ptr = chunk->c.map_ptr)) + ++chunk->c.map_count; + + wined3d_allocator_chunk_gl_unlock(chunk); + } + addr->buffer_object = &bo_gl->b; addr->addr = NULL; -- 2.30.2

2 1

[PATCH 1/5] wined3d: Move the "pin sysmem" flag to struct wined3d_resource.
by Zebediah Figura Feb. 18, 2022

Feb. 18, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 13 ++++++------- dlls/wined3d/texture.c | 18 +++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7c3537e466e..3ecaa9017d0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ -#define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep a system memory copy for this buffer. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -47,7 +46,7 @@ struct wined3d_buffer_ops static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) { - if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (buffer->resource.pin_sysmem) { TRACE("Not evicting system memory for buffer %p.\n", buffer); return; @@ -513,7 +512,7 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined ERR("Failed to load system memory.\n"); return; } - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->resource.pin_sysmem = 1; /* Now for each vertex in the buffer that needs conversion. */ vertex_count = buffer->resource.size / buffer->stride; @@ -666,7 +665,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { if (wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->resource.pin_sysmem = 1; return buffer->resource.heap_memory; } @@ -966,7 +965,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) - || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM + || buffer->resource.pin_sysmem || !(buffer->flags & WINED3D_BUFFER_USE_BO)) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) @@ -1036,7 +1035,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc { TRACE("Falling back to doublebuffered operation.\n"); wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->resource.pin_sysmem = 1; } TRACE("New pointer is %p.\n", resource->heap_memory); } @@ -1302,7 +1301,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d * maps and retain data in DISCARD maps. Keep a system memory copy of * the buffer to provide the same behavior to the application. */ TRACE("Pinning system memory.\n"); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->resource.pin_sysmem = 1; buffer->locations = WINED3D_LOCATION_SYSMEM; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b1fd1e7bde2..1323d533eff 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -48,8 +48,8 @@ struct wined3d_rect_f BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) { - if (!d3d_info->pbo || texture->resource.format->conv_byte_count - || (texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED))) + if (!d3d_info->pbo || texture->resource.format->conv_byte_count || texture->resource.pin_sysmem + || (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)) return FALSE; return TRUE; @@ -666,7 +666,8 @@ static void wined3d_texture_evict_sysmem(struct wined3d_texture *texture) struct wined3d_texture_sub_resource *sub_resource; unsigned int i, sub_count; - if (texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM) + if ((texture->flags & WINED3D_TEXTURE_CONVERTED) + || texture->resource.pin_sysmem || texture->download_count > WINED3D_TEXTURE_DYNAMIC_MAP_THRESHOLD) { TRACE("Not evicting system memory for texture %p.\n", texture); @@ -2462,8 +2463,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, if (dst_texture->sub_resources[dst_sub_resource_idx].map_count) { - WARN("Uploading a texture that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); - dst_texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; + WARN("Uploading a texture that is currently mapped, pinning sysmem.\n"); + dst_texture->resource.pin_sysmem = 1; } if (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE) @@ -3825,7 +3826,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS | WINED3D_TEXTURE_DOWNLOADABLE; if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) - texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_GET_DC_LENIENT; + { + texture->flags |= WINED3D_TEXTURE_GET_DC_LENIENT; + texture->resource.pin_sysmem = 1; + } if (flags & (WINED3D_TEXTURE_CREATE_GET_DC | WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)) texture->flags |= WINED3D_TEXTURE_GET_DC; if (flags & WINED3D_TEXTURE_CREATE_DISCARD) @@ -5744,7 +5748,7 @@ static bool blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) locations = texture->sub_resources[view->sub_resource_idx].locations; if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) - || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); + || texture->resource.pin_sysmem; return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) && !(texture->flags & WINED3D_TEXTURE_CONVERTED); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8c9bb7c8c6..e190fc4285e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4332,6 +4332,8 @@ struct wined3d_resource DWORD priority; void *heap_memory; + uint32_t pin_sysmem : 1; + struct wined3d_client_resource client; void *parent; @@ -4450,7 +4452,6 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000040 #define WINED3D_TEXTURE_SRGB_VALID 0x00000080 #define WINED3D_TEXTURE_CONVERTED 0x00000100 -#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000200 #define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 #define WINED3D_TEXTURE_GET_DC_LENIENT 0x00000800 #define WINED3D_TEXTURE_DC_IN_USE 0x00001000 -- 2.34.1

2 8

[PATCH] include: Add single-producer single-consumer ringbuffer implementation.
by Davide Beatrici Feb. 18, 2022

Feb. 18, 2022

Please note that I wrote a test for the ringbuffer, but I'm not sure where I should put it in the repository.

2 2

[PATCH] winebus.sys: Make hid_device_get_report_descriptor() static.
by Francois Gouget Feb. 18, 2022

Feb. 18, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 1b2681fdb94..64e4f2955ae 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1037,7 +1037,7 @@ static void hid_device_stop(struct unix_device *iface) iface->hid_vtbl->stop(iface); } -NTSTATUS hid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, UINT length, UINT *out_length) +static NTSTATUS hid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, UINT length, UINT *out_length) { *out_length = iface->hid_report_descriptor.size; if (length < iface->hid_report_descriptor.size) return STATUS_BUFFER_TOO_SMALL; -- 2.30.2

2 1

[PATCH] winetest: Also trace the country and ANSI code page.
by Francois Gouget Feb. 18, 2022

Feb. 18, 2022

Tracing the ANSI code page is useful to identify tests run in Windows' UTF-8 mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index b5c3cc54487..eb86770afbf 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -477,6 +477,8 @@ static void print_language(void) xprintf (" UserDefaultUILanguage=%04x\n", pGetUserDefaultUILanguage()); if (pGetThreadUILanguage) xprintf (" ThreadUILanguage=%04x\n", pGetThreadUILanguage()); + xprintf (" Country=%d\n", GetUserGeoID(GEOCLASS_NATION)); + xprintf (" ACP=%d\n", GetACP()); } static inline BOOL is_dot_dir(const char* x) -- 2.30.2

1 0

[PATCH resubmit] ncrypt: Add trailing linefeeds to ERR() messages.
by Francois Gouget Feb. 18, 2022

Feb. 18, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Yesterday's patch collided with Santino Mazza's higher priority patches. --- dlls/ncrypt/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 8e789573924..4f9a2f357bd 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -190,7 +190,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n { if (!(object->properties = malloc(sizeof(*property)))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } property = &object->properties[object->num_properties++]; @@ -200,7 +200,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n struct object_property *tmp; if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } object->properties = tmp; @@ -210,7 +210,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n memset(property, 0, sizeof(*property)); if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } @@ -218,7 +218,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n property->value_size = value_size; if (!(property->value = malloc(value_size))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); free(property->key); property->key = NULL; return NTE_NO_MEMORY; -- 2.30.2

1 0

[PATCH 2/2] win32u: Build without -DWINE_NO_LONG_TYPES.
by Jacek Caban Feb. 18, 2022

Feb. 18, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/Makefile.in | 1 - dlls/win32u/win32u_private.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)

1 0

[PATCH v4 1/5] winepulse.drv: Expose audio devices to the application.
by Gabriel Ivăncescu Feb. 18, 2022

Feb. 18, 2022

This exposes the actual devices (and virtual sinks/sources) as reported by PulseAudio to an application, allowing it to select the devices itself and, for example, record from (or render to) two devices at the same time. The "PulseAudio" device (which is movable) is still the default, as before, with the same GUID to preserve compatibility with existing setups. Based on a patch by Mark Harmstone <mark(a)harmstone.com>, with changes by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winepulse.drv/mmdevdrv.c | 205 ++++++++++++++++++++++++++++------ dlls/winepulse.drv/pulse.c | 140 +++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 20 ++++ 3 files changed, 321 insertions(+), 44 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e3d5ea9..3e6ac7c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -69,6 +69,8 @@ static GUID pulse_render_guid = static GUID pulse_capture_guid = { 0x25da76d0, 0x033c, 0x4235, { 0x90, 0x02, 0x19, 0xf4, 0x88, 0x94, 0xac, 0x6f } }; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winepulse.drv\\devices"; + static CRITICAL_SECTION session_cs; static CRITICAL_SECTION_DEBUG session_cs_debug = { 0, 0, &session_cs, @@ -145,9 +147,9 @@ struct ACImpl { AudioSession *session; AudioSessionWrapper *session_wrapper; -}; -static const WCHAR defaultW[] = L"PulseAudio"; + char pulse_name[0]; +}; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -267,39 +269,108 @@ static void set_stream_volumes(ACImpl *This) pulse_call(set_volumes, &params); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, - UINT *num, UINT *def_index) +static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name, GUID *guid) { - WCHAR *id; + WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; + DWORD type, size = sizeof(*guid); + LSTATUS status; + HKEY dev_key; - TRACE("%d %p %p %p\n", flow, ids, num, def_index); + if (!pulse_name[0]) { + *guid = (flow == eRender) ? pulse_render_guid : pulse_capture_guid; + return; + } - *num = 1; - *def_index = 0; + if (!drv_key) { + CoCreateGuid(guid); + return; + } - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(**ids)); - *keys = NULL; - if (!*ids) - return E_OUTOFMEMORY; + key_name[0] = (flow == eRender) ? '0' : '1'; + key_name[1] = ','; + MultiByteToWideChar(CP_UNIXCP, 0, pulse_name, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); - (*ids)[0] = id = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(**keys)); - if (!*keys || !id) { - HeapFree(GetProcessHeap(), 0, id); - HeapFree(GetProcessHeap(), 0, *keys); - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - *keys = NULL; - return E_OUTOFMEMORY; + status = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, + NULL, &dev_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open registry key for device %s: %u\n", pulse_name, status); + CoCreateGuid(guid); + return; } - memcpy(id, defaultW, sizeof(defaultW)); - if (flow == eRender) - (*keys)[0] = pulse_render_guid; - else - (*keys)[0] = pulse_capture_guid; + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size); + if (status != ERROR_SUCCESS || type != REG_BINARY || size != sizeof(*guid)) { + CoCreateGuid(guid); + status = RegSetValueExW(dev_key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(*guid)); + if (status != ERROR_SUCCESS) + ERR("Failed to store device GUID for %s to registry: %u\n", pulse_name, status); + } + RegCloseKey(dev_key); +} - return S_OK; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i = 0; + LSTATUS status; + HKEY drv_key; + + TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); + + params.flow = flow; + params.size = MAX_PULSE_NAME_LEN * 4; + params.endpoints = NULL; + do { + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + pulse_call(get_endpoint_ids, &params); + } while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if (FAILED(params.result)) + goto end; + + ids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if (!ids || !guids) { + params.result = E_OUTOFMEMORY; + goto end; + } + + status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, + KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open devices registry key: %u\n", status); + drv_key = NULL; + } + + for (i = 0; i < params.num; i++) { + unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)))) { + params.result = E_OUTOFMEMORY; + break; + } + memcpy(ids[i], params.endpoints[i].name, size); + get_device_guid(drv_key, flow, params.endpoints[i].pulse_name, &guids[i]); + } + if (drv_key) + RegCloseKey(drv_key); + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if (FAILED(params.result)) { + HeapFree(GetProcessHeap(), 0, guids); + while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); + } else { + *ids_out = ids; + *keys = guids; + *num = params.num; + *def_index = params.default_idx; + } + return params.result; } int WINAPI AUDDRV_GetPriority(void) @@ -314,23 +385,87 @@ int WINAPI AUDDRV_GetPriority(void) return SUCCEEDED(params.result) ? Priority_Preferred : Priority_Unavailable; } +static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_NAME_LEN], EDataFlow *flow) +{ + WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; + DWORD key_name_size; + DWORD index = 0; + HKEY key; + + /* Return empty string for default PulseAudio device */ + pulse_name[0] = 0; + if (IsEqualGUID(guid, &pulse_render_guid)) { + *flow = eRender; + return TRUE; + } else if (IsEqualGUID(guid, &pulse_capture_guid)) { + *flow = eCapture; + return TRUE; + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_READ | KEY_WOW64_64KEY, &key) != ERROR_SUCCESS) { + WARN("No devices found in registry\n"); + return FALSE; + } + + for (;;) { + DWORD size, type; + LSTATUS status; + GUID reg_guid; + HKEY dev_key; + + key_name_size = ARRAY_SIZE(key_name); + if (RegEnumKeyExW(key, index++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if (RegOpenKeyExW(key, key_name, 0, KEY_READ | KEY_WOW64_64KEY, &dev_key) != ERROR_SUCCESS) { + ERR("Couldn't open key: %s\n", wine_dbgstr_w(key_name)); + continue; + } + + size = sizeof(reg_guid); + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE *)&reg_guid, &size); + RegCloseKey(dev_key); + + if (status == ERROR_SUCCESS && type == REG_BINARY && size == sizeof(reg_guid) && IsEqualGUID(&reg_guid, guid)) { + RegCloseKey(key); + + TRACE("Found matching device key: %s\n", wine_dbgstr_w(key_name)); + + if (key_name[0] == '0') + *flow = eRender; + else if (key_name[0] == '1') + *flow = eCapture; + else { + WARN("Unknown device type: %c\n", key_name[0]); + return FALSE; + } + + return WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, pulse_name, MAX_PULSE_NAME_LEN, NULL, NULL); + } + } + + RegCloseKey(key); + WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid)); + return FALSE; +} + HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; + char pulse_name[MAX_PULSE_NAME_LEN]; EDataFlow dataflow; + unsigned len; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if (IsEqualGUID(guid, &pulse_render_guid)) - dataflow = eRender; - else if (IsEqualGUID(guid, &pulse_capture_guid)) - dataflow = eCapture; - else - return E_UNEXPECTED; + + if (!get_pulse_name_by_guid(guid, pulse_name, &dataflow)) + return AUDCLNT_E_DEVICE_INVALIDATED; *out = NULL; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + len = strlen(pulse_name) + 1; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(ACImpl, pulse_name[len])); if (!This) return E_OUTOFMEMORY; @@ -342,6 +477,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; This->dataflow = dataflow; This->parent = dev; + memcpy(This->pulse_name, pulse_name, len); hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); if (FAILED(hr)) { @@ -609,6 +745,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } params.name = name = get_application_name(); + params.pulse_name = This->pulse_name; params.dataflow = This->dataflow; params.mode = mode; params.flags = flags; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 3e65936..311c9bb 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -81,6 +81,12 @@ typedef struct _ACPacket UINT32 discont; } ACPacket; +typedef struct _PhysDevice { + struct list entry; + WCHAR *name; + char pulse_name[0]; +} PhysDevice; + static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; @@ -89,6 +95,8 @@ static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; static UINT g_phys_speakers_mask = 0; +static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); +static struct list g_phys_sources = LIST_INIT(g_phys_sources); static const REFERENCE_TIME MinimumPeriod = 30000; static const REFERENCE_TIME DefaultPeriod = 100000; @@ -128,6 +136,20 @@ static void dump_attr(const pa_buffer_attr *attr) TRACE("prebuf: %u\n", attr->prebuf); } +static void free_phys_device_lists(void) +{ + static struct list *const lists[] = { &g_phys_speakers, &g_phys_sources, NULL }; + struct list *const *list = lists; + PhysDevice *dev, *dev_next; + + do { + LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, *list, PhysDevice, entry) { + free(dev->name); + free(dev); + } + } while (*(++list)); +} + /* copied from kernelbase */ static int muldiv(int a, int b, int c) { @@ -190,6 +212,7 @@ static NTSTATUS pulse_process_attach(void *args) static NTSTATUS pulse_process_detach(void *args) { + free_phys_device_lists(); if (pulse_ctx) { pa_context_disconnect(pulse_ctx); @@ -215,6 +238,44 @@ static NTSTATUS pulse_main_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS pulse_get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; + struct endpoint *endpoint = params->endpoints; + DWORD len, name_len, needed; + PhysDevice *dev; + char *ptr; + + params->num = list_count(list); + needed = params->num * sizeof(*params->endpoints); + ptr = (char*)(endpoint + params->num); + + LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { + name_len = lstrlenW(dev->name) + 1; + len = strlen(dev->pulse_name) + 1; + needed += name_len * sizeof(WCHAR) + ((len + 1) & ~1); + + if (needed <= params->size) { + endpoint->name = (WCHAR*)ptr; + memcpy(endpoint->name, dev->name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->pulse_name = ptr; + memcpy(endpoint->pulse_name, dev->pulse_name, len); + ptr += (len + 1) & ~1; + endpoint++; + } + } + params->default_idx = 0; + + if (needed > params->size) { + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + return STATUS_SUCCESS; +} + static void pulse_contextcallback(pa_context *c, void *userdata) { switch (pa_context_get_state(c)) { @@ -357,12 +418,49 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } -/* For default PulseAudio render device, OR together all of the - * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ +static void pulse_add_device(struct list *list, const char *pulse_name, const char *name) +{ + DWORD len = strlen(pulse_name), name_len = strlen(name); + PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); + WCHAR *wname; + + if (!dev) + return; + + if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + free(dev); + return; + } + + if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || + !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { + free(wname); + free(dev); + return; + } + dev->name[name_len] = 0; + memcpy(dev->pulse_name, pulse_name, len + 1); + + list_add_tail(list, &dev->entry); +} + static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { - if (i) - g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + if (!i || !i->name || !i->name[0]) + return; + + /* For default PulseAudio render device, OR together all of the + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ + g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + + pulse_add_device(&g_phys_speakers, i->name, i->description); +} + +static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) +{ + if (!i || !i->name || !i->name[0]) + return; + pulse_add_device(&g_phys_sources, i->name, i->description); } /* For most hardware on Windows, users must choose a configuration with an even @@ -579,7 +677,14 @@ static NTSTATUS pulse_test_connect(void *args) pulse_probe_settings(1, &pulse_fmt[0]); pulse_probe_settings(0, &pulse_fmt[1]); + free_phys_device_lists(); + list_init(&g_phys_speakers); + list_init(&g_phys_sources); g_phys_speakers_mask = 0; + + pulse_add_device(&g_phys_speakers, "", "PulseAudio"); + pulse_add_device(&g_phys_sources, "", "PulseAudio"); + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) { while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && @@ -588,6 +693,14 @@ static NTSTATUS pulse_test_connect(void *args) pa_operation_unref(o); } + o = pa_context_get_source_info_list(pulse_ctx, &pulse_phys_sources_cb, NULL); + if (o) { + while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && + pa_operation_get_state(o) == PA_OPERATION_RUNNING) + {} + pa_operation_unref(o); + } + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); @@ -771,8 +884,9 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV return S_OK; } -static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_bytes) +static HRESULT pulse_stream_connect(struct pulse_stream *stream, const char *pulse_name, UINT32 period_bytes) { + pa_stream_flags_t flags = PA_STREAM_START_CORKED | PA_STREAM_START_UNMUTED | PA_STREAM_ADJUST_LATENCY; int ret; char buffer[64]; static LONG number; @@ -797,12 +911,17 @@ static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_b attr.maxlength = stream->bufsize_frames * pa_frame_size(&stream->ss); attr.prebuf = pa_frame_size(&stream->ss); dump_attr(&attr); + + /* If specific device was requested, use it exactly */ + if (pulse_name[0]) + flags |= PA_STREAM_DONT_MOVE; + else + pulse_name = NULL; /* use default */ + if (stream->dataflow == eRender) - ret = pa_stream_connect_playback(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY, NULL, NULL); + ret = pa_stream_connect_playback(stream->stream, pulse_name, &attr, flags, NULL, NULL); else - ret = pa_stream_connect_record(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY); + ret = pa_stream_connect_record(stream->stream, pulse_name, &attr, flags); if (ret < 0) { WARN("Returns %i\n", ret); return AUDCLNT_E_ENDPOINT_CREATE_FAILED; @@ -864,7 +983,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->share = params->mode; stream->flags = params->flags; - hr = pulse_stream_connect(stream, stream->period_bytes); + hr = pulse_stream_connect(stream, params->pulse_name, stream->period_bytes); if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); @@ -1967,6 +2086,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_process_attach, pulse_process_detach, pulse_main_loop, + pulse_get_endpoint_ids, pulse_create_stream, pulse_release_stream, pulse_start, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index d28a73c..982704a 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -19,6 +19,8 @@ #include "wine/list.h" #include "wine/unixlib.h" +#define MAX_PULSE_NAME_LEN 256 + struct pulse_stream; struct pulse_config @@ -32,14 +34,31 @@ struct pulse_config unsigned int speakers_mask; }; +struct endpoint +{ + WCHAR *name; + char *pulse_name; +}; + struct main_loop_params { HANDLE event; }; +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + struct create_stream_params { const char *name; + const char *pulse_name; EDataFlow dataflow; AUDCLNT_SHAREMODE mode; DWORD flags; @@ -191,6 +210,7 @@ enum unix_funcs process_attach, process_detach, main_loop, + get_endpoint_ids, create_stream, release_stream, start, -- 2.34.1

1 4