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

Zebediah Figura : wined3d: Directly call wined3d_texture_create() to create swapchain textures.
by Alexandre Julliard 04 May '23

04 May '23

Module: wine Branch: master Commit: c7d8a1b47a2e64c0380f4b57c1bc02276301ddf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7d8a1b47a2e64c0380f4b57c1bc02… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 11 20:04:33 2023 -0500 wined3d: Directly call wined3d_texture_create() to create swapchain textures. Get rid of the create_swapchain_texture callback. --- dlls/d3d11/device.c | 14 -------------- dlls/d3d8/device.c | 21 --------------------- dlls/d3d9/device.c | 21 --------------------- dlls/ddraw/ddraw.c | 21 --------------------- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/swapchain.c | 12 ++++++------ include/wine/wined3d.h | 2 -- 7 files changed, 8 insertions(+), 87 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4cf066ef945..ca231af9652 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -6893,26 +6893,12 @@ static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_d return S_OK; } -static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, - void *container_parent, const struct wined3d_resource_desc *wined3d_desc, DWORD texture_flags, - struct wined3d_texture **wined3d_texture) -{ - struct d3d_device *device = device_from_wined3d_device_parent(device_parent); - - TRACE("device_parent %p, container_parent %p, wined3d_desc %p, texture_flags %#lx, wined3d_texture %p.\n", - device_parent, container_parent, wined3d_desc, texture_flags, wined3d_texture); - - return wined3d_texture_create(device->wined3d_device, wined3d_desc, 1, 1, - texture_flags, NULL, NULL, &d3d_null_wined3d_parent_ops, wined3d_texture); -} - static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, device_parent_texture_sub_resource_created, - device_parent_create_swapchain_texture, }; static int d3d_sampler_state_compare(const void *key, const struct wine_rb_entry *entry) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8ae6b5ce7b9..3727ad3e4eb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3624,33 +3624,12 @@ static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_d return D3D_OK; } -static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, - void *container_parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, - struct wined3d_texture **texture) -{ - struct d3d8_device *device = device_from_device_parent(device_parent); - HRESULT hr; - - TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#lx, texture %p.\n", - device_parent, container_parent, desc, texture_flags, texture); - - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags, - NULL, NULL, &d3d8_null_wined3d_parent_ops, texture))) - { - WARN("Failed to create texture, hr %#lx.\n", hr); - return hr; - } - - return hr; -} - static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, device_parent_texture_sub_resource_created, - device_parent_create_swapchain_texture, }; static void setup_fpu(void) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b5a16177e37..35ba241c23a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4555,33 +4555,12 @@ static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_d return D3D_OK; } -static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, - void *container_parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, - struct wined3d_texture **texture) -{ - struct d3d9_device *device = device_from_device_parent(device_parent); - HRESULT hr; - - TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#lx, texture %p.\n", - device_parent, container_parent, desc, texture_flags, texture); - - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, - texture_flags, NULL, NULL, &d3d9_null_wined3d_parent_ops, texture))) - { - WARN("Failed to create texture, hr %#lx.\n", hr); - return hr; - } - - return hr; -} - static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, device_parent_texture_sub_resource_created, - device_parent_create_swapchain_texture, }; static void setup_fpu(void) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c56226fb71d..baa3219ae47 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5042,33 +5042,12 @@ static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_d return DD_OK; } -static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, - void *container_parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, - struct wined3d_texture **texture) -{ - struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - HRESULT hr; - - TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#lx, texture %p.\n", - device_parent, container_parent, desc, texture_flags, texture); - - if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, desc, 1, 1, - texture_flags, NULL, ddraw, &ddraw_null_wined3d_parent_ops, texture))) - { - WARN("Failed to create texture, hr %#lx.\n", hr); - return hr; - } - - return hr; -} - static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, device_parent_texture_sub_resource_created, - device_parent_create_swapchain_texture, }; HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type device_type) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1603329a59f..df186d9ffa2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5993,8 +5993,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, texture_desc.depth = 1; texture_desc.size = 0; - if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, - device->device_parent, &texture_desc, 0, &texture))) + if (FAILED(hr = wined3d_texture_create(device, &texture_desc, 1, 1, 0, + NULL, NULL, &wined3d_null_parent_ops, &texture))) { ERR("Failed to create the auto depth/stencil surface, hr %#lx.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b31c3393767..e6938ea14dc 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1541,8 +1541,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (swapchain->state.desc.flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; - if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, - parent, &texture_desc, texture_flags, &swapchain->front_buffer))) + if (FAILED(hr = wined3d_texture_create(device, &texture_desc, 1, 1, texture_flags, + NULL, NULL, &wined3d_null_parent_ops, &swapchain->front_buffer))) { WARN("Failed to create front buffer, hr %#lx.\n", hr); goto err; @@ -1587,8 +1587,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc for (i = 0; i < swapchain->state.desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); - if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, - parent, &texture_desc, texture_flags, &swapchain->back_buffers[i]))) + if (FAILED(hr = wined3d_texture_create(device, &texture_desc, 1, 1, texture_flags, + NULL, NULL, &wined3d_null_parent_ops, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#lx.\n", i, hr); swapchain->state.desc.backbuffer_count = i; @@ -1615,8 +1615,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc else texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; - if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, - device->device_parent, &texture_desc, 0, &ds))) + if (FAILED(hr = wined3d_texture_create(device, &texture_desc, 1, 1, 0, + NULL, NULL, &wined3d_null_parent_ops, &ds))) { WARN("Failed to create the auto depth/stencil surface, hr %#lx.\n", hr); goto err; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 32a1a70b040..71a5d92c301 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2241,8 +2241,6 @@ struct wined3d_device_parent_ops HRESULT (__cdecl *texture_sub_resource_created)(struct wined3d_device_parent *device_parent, enum wined3d_resource_type type, struct wined3d_texture *texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops); - HRESULT (__cdecl *create_swapchain_texture)(struct wined3d_device_parent *device_parent, void *parent, - const struct wined3d_resource_desc *desc, DWORD texture_flags, struct wined3d_texture **texture); }; struct wined3d_swapchain_state_parent

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.250.
by Alexandre Julliard 04 May '23

04 May '23

Module: wine Branch: master Commit: e32711dd2fee94cba3ccd145397fd1904e6a397f URL: https://gitlab.winehq.org/wine/wine/-/commit/e32711dd2fee94cba3ccd145397fd1… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu May 4 12:14:05 2023 +0200 winevulkan: Update to VK spec version 1.3.250. --- dlls/winevulkan/loader_thunks.c | 9 +++ dlls/winevulkan/loader_thunks.h | 7 +++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 122 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 2 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 32 ++++++++++- 7 files changed, 171 insertions(+), 5 deletions(-)

1 0

Rémi Bernon : riched20: Update the editor IME position on GCS_RESULTSTR.
by Alexandre Julliard 04 May '23

04 May '23

Module: wine Branch: master Commit: de45bc33a73eac5dbc3502b4a43cd48399507c73 URL: https://gitlab.winehq.org/wine/wine/-/commit/de45bc33a73eac5dbc3502b4a43cd4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 4 11:23:08 2023 +0200 riched20: Update the editor IME position on GCS_RESULTSTR. So that a GCS_RESULTSTR followed by GCS_COMPSTR, without interruping the composition, begins inserting the new composition text after the result instead of before it. --- dlls/riched20/editor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9c84a810569..412648d9116 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4140,6 +4140,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, if (dwIndex == GCS_COMPSTR) set_selection_cursors(editor,editor->imeStartIndex, editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); + else + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); } ME_ReleaseStyle(style); ME_CommitUndo(editor);

1 0

Davide Beatrici : winecoreaudio: Implement per-channel volume control.
by Alexandre Julliard 04 May '23

04 May '23

Module: wine Branch: master Commit: f46e9b8f120605d984f4ae14b4c815a67fbd1b59 URL: https://gitlab.winehq.org/wine/wine/-/commit/f46e9b8f120605d984f4ae14b4c815… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed May 3 21:01:37 2023 +0200 winecoreaudio: Implement per-channel volume control. --- dlls/winecoreaudio.drv/coreaudio.c | 37 ++++++++++++++++++++----------------- dlls/winecoreaudio.drv/mmdevdrv.c | 16 +++++++--------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index aef678e7ca7..902d01459c4 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1665,28 +1665,31 @@ static NTSTATUS unix_set_volumes(void *args) { struct set_volumes_params *params = args; struct coreaudio_stream *stream = handle_get_stream(params->stream); - Float32 level = 1.0, tmp; + Float32 level = params->master_volume; OSStatus sc; UINT32 i; + AudioObjectPropertyAddress prop_addr = { + kAudioDevicePropertyVolumeScalar, + kAudioObjectPropertyScopeGlobal, + kAudioObjectPropertyElementMaster + }; - if(params->channel >= stream->fmt->nChannels || params->channel < -1){ - ERR("Incorrect channel %d\n", params->channel); - return STATUS_SUCCESS; - } + sc = AudioObjectSetPropertyData(stream->dev_id, &prop_addr, 0, NULL, sizeof(float), &level); + if (sc == noErr) + level = 1.0f; + else + WARN("Couldn't set master volume, applying it directly to the channels: %x\n", (int)sc); - if(params->channel == -1){ - for(i = 0; i < stream->fmt->nChannels; ++i){ - tmp = params->master_volume * params->volumes[i] * params->session_volumes[i]; - level = tmp < level ? tmp : level; - } - }else - level = params->master_volume * params->volumes[params->channel] * - params->session_volumes[params->channel]; + for (i = 1; i <= stream->fmt->nChannels; ++i) { + const float vol = level * params->session_volumes[i - 1] * params->volumes[i - 1]; + + prop_addr.mElement = i; - sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, - kAudioUnitScope_Global, 0, level, 0); - if(sc != noErr) - WARN("Couldn't set volume: %x\n", (int)sc); + sc = AudioObjectSetPropertyData(stream->dev_id, &prop_addr, 0, NULL, sizeof(float), &vol); + if (sc != noErr) { + WARN("Couldn't set channel #%u volume: %x\n", i, (int)sc); + } + } return STATUS_SUCCESS; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5113132f09b..6f62a69028b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -224,7 +224,7 @@ static void get_device_guid(EDataFlow flow, const char *dev, GUID *guid) RegCloseKey(key); } -static void set_stream_volumes(ACImpl *This, int channel) +static void set_stream_volumes(ACImpl *This) { struct set_volumes_params params; @@ -232,7 +232,7 @@ static void set_stream_volumes(ACImpl *This, int channel) params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = channel; + params.channel = 0; UNIX_CALL(set_volumes, &params); } @@ -689,7 +689,7 @@ end: This->vols = NULL; }else{ This->stream = stream; - set_stream_volumes(This, -1); + set_stream_volumes(This); } sessions_unlock(); @@ -1521,8 +1521,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; - WARN("CoreAudio doesn't support per-channel volume control\n"); - set_stream_volumes(This, index); + set_stream_volumes(This); sessions_unlock(); @@ -1566,7 +1565,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - set_stream_volumes(This, -1); + set_stream_volumes(This); sessions_unlock(); @@ -1682,9 +1681,8 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; - WARN("CoreAudio doesn't support per-channel volume control\n"); LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) - set_stream_volumes(client, index); + set_stream_volumes(client); sessions_unlock(); @@ -1737,7 +1735,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( session->channel_vols[i] = levels[i]; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) - set_stream_volumes(client, -1); + set_stream_volumes(client); sessions_unlock();

1 0

Davide Beatrici : mmdevapi: Remove unused "channel" member in set_volumes_params.
by Alexandre Julliard 04 May '23

04 May '23

Module: wine Branch: master Commit: 460eaee43de8a44ea35cfdc5cdc1ca2aa015c45d URL: https://gitlab.winehq.org/wine/wine/-/commit/460eaee43de8a44ea35cfdc5cdc1ca… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 2 02:23:25 2023 +0200 mmdevapi: Remove unused "channel" member in set_volumes_params. --- dlls/mmdevapi/session.c | 1 - dlls/mmdevapi/unixlib.h | 1 - dlls/winealsa.drv/alsa.c | 2 -- dlls/winealsa.drv/mmdevdrv.c | 1 - dlls/winecoreaudio.drv/coreaudio.c | 2 -- dlls/winecoreaudio.drv/mmdevdrv.c | 1 - dlls/wineoss.drv/mmdevdrv.c | 1 - dlls/wineoss.drv/oss.c | 2 -- dlls/winepulse.drv/mmdevdrv.c | 1 - dlls/winepulse.drv/pulse.c | 2 -- 10 files changed, 14 deletions(-) diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index 825fd44d4cf..1f980282417 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -52,7 +52,6 @@ static void set_stream_volumes(struct audio_client *This) params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0; WINE_UNIX_CALL(set_volumes, &params); } diff --git a/dlls/mmdevapi/unixlib.h b/dlls/mmdevapi/unixlib.h index 37b4c53cb35..b1e025a512b 100644 --- a/dlls/mmdevapi/unixlib.h +++ b/dlls/mmdevapi/unixlib.h @@ -207,7 +207,6 @@ struct set_volumes_params float master_volume; const float *volumes; const float *session_volumes; - int channel; }; struct set_event_handle_params diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 2b5f61eb213..200798a64e6 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2767,7 +2767,6 @@ static NTSTATUS alsa_wow64_set_volumes(void *args) float master_volume; PTR32 volumes; PTR32 session_volumes; - int channel; } *params32 = args; struct set_volumes_params params = { @@ -2775,7 +2774,6 @@ static NTSTATUS alsa_wow64_set_volumes(void *args) .master_volume = params32->master_volume, .volumes = ULongToPtr(params32->volumes), .session_volumes = ULongToPtr(params32->session_volumes), - .channel = params32->channel }; return alsa_set_volumes(&params); } diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6ea8882de59..96d71e98272 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -261,7 +261,6 @@ static void set_stream_volumes(ACImpl *This) params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0; ALSA_CALL(set_volumes, &params); } diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 902d01459c4..83c8048ff43 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -2046,7 +2046,6 @@ static NTSTATUS unix_wow64_set_volumes(void *args) float master_volume; PTR32 volumes; PTR32 session_volumes; - int channel; } *params32 = args; struct set_volumes_params params = { @@ -2054,7 +2053,6 @@ static NTSTATUS unix_wow64_set_volumes(void *args) .master_volume = params32->master_volume, .volumes = ULongToPtr(params32->volumes), .session_volumes = ULongToPtr(params32->session_volumes), - .channel = params32->channel }; return unix_set_volumes(&params); } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6f62a69028b..f387e9f71ab 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -232,7 +232,6 @@ static void set_stream_volumes(ACImpl *This) params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0; UNIX_CALL(set_volumes, &params); } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 89dbeac62bc..d41d0597721 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -271,7 +271,6 @@ static void set_stream_volumes(ACImpl *This) params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0; OSS_CALL(set_volumes, &params); } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 96d84a07d00..035f6eced97 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1974,7 +1974,6 @@ static NTSTATUS oss_wow64_set_volumes(void *args) float master_volume; PTR32 volumes; PTR32 session_volumes; - int channel; } *params32 = args; struct set_volumes_params params = { @@ -1982,7 +1981,6 @@ static NTSTATUS oss_wow64_set_volumes(void *args) .master_volume = params32->master_volume, .volumes = ULongToPtr(params32->volumes), .session_volumes = ULongToPtr(params32->session_volumes), - .channel = params32->channel }; return oss_set_volumes(&params); } diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 59e2d086d0b..c3bc02267b5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -316,7 +316,6 @@ static void set_stream_volumes(ACImpl *This) params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0; pulse_call(set_volumes, &params); } diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 28afb5b788d..a3354c5efe2 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2723,7 +2723,6 @@ static NTSTATUS pulse_wow64_set_volumes(void *args) float master_volume; PTR32 volumes; PTR32 session_volumes; - int channel; } *params32 = args; struct set_volumes_params params = { @@ -2731,7 +2730,6 @@ static NTSTATUS pulse_wow64_set_volumes(void *args) .master_volume = params32->master_volume, .volumes = ULongToPtr(params32->volumes), .session_volumes = ULongToPtr(params32->session_volumes), - .channel = params32->channel }; return pulse_set_volumes(&params); }

1 0

Alexandre Julliard : ntdll: Initialize TLS links also on the 64-bit side in wow64 mode.
by Alexandre Julliard 04 May '23

04 May '23

Module: wine Branch: master Commit: b247a33fa1ce570f156c174e920d2e41b92f07a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b247a33fa1ce570f156c174e920d2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 4 10:39:12 2023 +0200 ntdll: Initialize TLS links also on the 64-bit side in wow64 mode. --- dlls/ntdll/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7eb8e9ee8f1..5a53f4bcb9d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4046,6 +4046,10 @@ static void init_wow64( CONTEXT *context ) imports_fixup_done = TRUE; } + RtlAcquirePebLock(); + InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); + RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); pWow64LdrpInitialize( context ); }

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 03 May '23

03 May '23

Module: wine Branch: master Commit: 423eb0a15f60a1f7341b815cc0f73e39fa55ba84 URL: https://gitlab.winehq.org/wine/wine/-/commit/423eb0a15f60a1f7341b815cc0f73e… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed May 3 16:28:19 2023 +0200 po: Update Dutch translation. --- po/nl.po | 78 ++++++++++++++++++++++++++-------------------------------------- 1 file changed, 31 insertions(+), 47 deletions(-) diff --git a/po/nl.po b/po/nl.po index 811c6c5d0a3..c56e059e12d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-03-31 12:05+0200\n" +"PO-Revision-Date: 2023-05-03 16:25+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -325,7 +325,7 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:47 msgid "Please wait until the current uninstall/modify process is complete." -msgstr "" +msgstr "Wacht totdat het verwijderen/ veranderen voltooid is." #: dlls/avifil32/avifil32.rc:42 msgid "Compress options" @@ -2399,7 +2399,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (*.p7b)" +msgstr "Cryptografische berichtenopbouw standaard/PKCS #7 berichten (*.p7b)" #: dlls/cryptui/cryptui.rc:306 msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" @@ -2565,7 +2565,7 @@ msgstr "Ba&se64-geëncodeerde X.509 (.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "&Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (*.p7b)" +msgstr "&Cryptografische berichtenopbouw standaard/PKCS #7 berichten (*.p7b)" #: dlls/cryptui/cryptui.rc:419 msgid "&Include all certificates in the certification path if possible" @@ -3903,7 +3903,7 @@ msgstr "Argument is niet optioneel" #: dlls/jscript/jscript.rc:37 msgid "Syntax error" -msgstr "Syntax fout" +msgstr "Formuleringsfout" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" @@ -4027,7 +4027,7 @@ msgstr "Reguliere Expressie-object verwacht" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" -msgstr "Syntax fout in reguliere expressie" +msgstr "Formuleringsfout in reguliere expressie" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" @@ -6341,7 +6341,7 @@ msgstr "Product verwijderd.\n" #: dlls/kernelbase/winerror.mc:2798 msgid "Invalid query syntax.\n" -msgstr "Ongeldige vraagsyntax.\n" +msgstr "Ongeldige vraag formulering.\n" #: dlls/kernelbase/winerror.mc:2803 msgid "Invalid field.\n" @@ -6565,7 +6565,7 @@ msgstr "RPC-protocol fout.\n" #: dlls/kernelbase/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "Transfer-syntax wordt niet ondersteund.\n" +msgstr "Overdrachtsformulering wordt niet ondersteund.\n" #: dlls/kernelbase/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6581,11 +6581,11 @@ msgstr "Geen entry-naam.\n" #: dlls/kernelbase/winerror.mc:3103 msgid "Invalid name syntax.\n" -msgstr "Ongeldige naam-syntax.\n" +msgstr "Ongeldige formulering van de naam.\n" #: dlls/kernelbase/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "Naam-syntax wordt niet ondersteund.\n" +msgstr "Niet ondersteunde formulering van de naam.\n" #: dlls/kernelbase/winerror.mc:3113 msgid "No network address.\n" @@ -7053,7 +7053,7 @@ msgstr "Geen toegang mogelijk tot het bestand.\n" #: dlls/kernelbase/winerror.mc:3693 msgid "The filename cannot be resolved.\n" -msgstr "De bestandsnaam kan niet worden geresolveerd.\n" +msgstr "De bestandsnaam kan niet worden vastgesteld.\n" #: dlls/kernelbase/winerror.mc:3698 msgid "RPC entry type mismatch.\n" @@ -12721,7 +12721,7 @@ msgstr "Het URL-schema wordt niet herkent of ondersteund.\n" #: dlls/wininet/winineterror.mc:46 msgid "The server name could not be resolved.\n" -msgstr "De servernaam kan niet worden omgezet.\n" +msgstr "De servernaam kan niet worden vastgesteld.\n" #: dlls/wininet/winineterror.mc:51 msgid "The requested operation is invalid.\n" @@ -13467,7 +13467,7 @@ msgstr "Attribuut of waarde bestaat" #: dlls/wldap32/wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Ongeldige syntax" +msgstr "Ongeldige formulering" #: dlls/wldap32/wldap32.rc:64 msgid "No Such Object" @@ -13479,7 +13479,7 @@ msgstr "Aliasprobleem" #: dlls/wldap32/wldap32.rc:66 msgid "Invalid DN Syntax" -msgstr "Ongeldige DN-syntax" +msgstr "Ongeldige DN-formulering" #: dlls/wldap32/wldap32.rc:67 msgid "Is Leaf" @@ -14061,7 +14061,7 @@ msgstr "" "\n" "SET zonder parameters toont alle omgevingsvariabelen.\n" "\n" -"De syntax voor het maken of wijzigen van een omgevingsvariabele is:\n" +"De opdracht voor het maken of wijzigen van een omgevingsvariabele is:\n" "\n" "SET <variable>=<waarde>\n" "\n" @@ -14440,7 +14440,7 @@ msgstr "Argument ontbreekt\n" #: programs/cmd/cmd.rc:375 msgid "Syntax error\n" -msgstr "Syntaxisfout\n" +msgstr "Formuleringsfout\n" #: programs/cmd/cmd.rc:377 msgid "No help available for %1\n" @@ -14762,24 +14762,20 @@ msgid "&Run..." msgstr "&Uitvoeren..." #: programs/findstr/findstr.rc:28 -#, fuzzy -#| msgid "Use c&onnection string" msgid "Usage: findstr /options string\n" -msgstr "Ver&bindingsreeks gebruiken" +msgstr "Gebruik: findstr /opties string\n" #: programs/findstr/findstr.rc:29 -#, fuzzy -#| msgid "Invalid command line.\n" msgid "FINDSTR: Bad command line\n" -msgstr "Ongeldige opdrachtregel.\n" +msgstr "FINDSTR: Foutieve opdrachtregel\n" #: programs/findstr/findstr.rc:30 msgid "FINDSTR: Cannot open %s\n" -msgstr "" +msgstr "FINDSTR: Kan %s niet openen\n" #: programs/findstr/findstr.rc:31 msgid "FINDSTR: /%c ignored\n" -msgstr "" +msgstr "FINDSTR: /%c genegeerd\n" #: programs/fsutil/fsutil.mc:28 msgid "" @@ -15968,7 +15964,7 @@ msgstr "Pictogrammen (*.ico)" #: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " -msgstr "reg: Foutieve syntax. " +msgstr "reg: Foutieve formulering. " #: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" @@ -17365,14 +17361,12 @@ msgstr "" "Signaal verzonden om PID %1!u!, onderdeel van PID %2!u!, af te sluiten.\n" #: include/wine/wine_common_ver.rc:138 -#, fuzzy -#| msgid "page tab list" msgid "Wine tasklist" -msgstr "paginatablijst" +msgstr "Wine takenlijst" #: programs/tasklist/tasklist.rc:29 msgid "Usage: tasklist [/?]\n" -msgstr "" +msgstr "Gebruik: tasklist [/?]\n" #: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272 msgid "Image Name" @@ -17380,41 +17374,31 @@ msgstr "Procesnaam" #: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273 msgid "PID" -msgstr "Proces-ID" +msgstr "PID" #: programs/tasklist/tasklist.rc:32 -#, fuzzy -#| msgid "Session ID" msgid "Session Name" -msgstr "Sessie-ID" +msgstr "Sessie Naam" #: programs/tasklist/tasklist.rc:33 -#, fuzzy -#| msgid "Session ID" msgid "Session#" -msgstr "Sessie-ID" +msgstr "Sessie Nr." #: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276 msgid "Mem Usage" -msgstr "Geheugengebruik" +msgstr "Geheugengebr." #: programs/tasklist/tasklist.rc:35 -#, fuzzy -#| msgid "OK" msgid "K" -msgstr "OK" +msgstr "K" #: programs/tasklist/tasklist.rc:36 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "ERROR: Invalid syntax\n" -msgstr "reg: Foutieve syntax. " +msgstr "FOUT: Ongeldige formulering\n" #: programs/tasklist/tasklist.rc:37 -#, fuzzy -#| msgid "The filename cannot be resolved.\n" msgid "ERROR: The search filter cannot be recognized.\n" -msgstr "De bestandsnaam kan niet worden geresolveerd.\n" +msgstr "FOUT: Het zoekfilter wordt niet herkend.\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -19382,7 +19366,7 @@ msgstr "Fout: Foutieve zoekopdracht\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "Fout: Foutieve syntax voor PATH\n" +msgstr "Fout: Foutieve formulering voor PATH\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N"

1 0

Conor McCarthy : vkd3d: Leave the command queue op mutex locked after a partial flush.
by Alexandre Julliard 03 May '23

03 May '23

Module: wine Branch: master Commit: b2600c83382130e834062afd9907ee6e286d23fe URL: https://gitlab.winehq.org/wine/wine/-/commit/b2600c83382130e834062afd9907ee… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Apr 14 10:42:39 2023 +0200 vkd3d: Leave the command queue op mutex locked after a partial flush. All return paths in d3d12_command_queue_flush_ops_locked() must leave the op mutex locked. (cherry-picked from upstream commit e27ceddfb4a89470d5d35ab4391d0a5cf4453ef1) --- libs/vkd3d/libs/vkd3d/command.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/libs/vkd3d/command.c b/libs/vkd3d/libs/vkd3d/command.c index e5ead7d3e4e..6eddcfa2d14 100644 --- a/libs/vkd3d/libs/vkd3d/command.c +++ b/libs/vkd3d/libs/vkd3d/command.c @@ -6781,16 +6781,16 @@ static bool d3d12_command_queue_op_array_append(struct d3d12_command_queue_op_ar return true; } -static HRESULT d3d12_command_queue_fixup_after_flush(struct d3d12_command_queue *queue, unsigned int done_count) +static void d3d12_command_queue_delete_aux_ops(struct d3d12_command_queue *queue, + unsigned int done_count) { - HRESULT hr; - queue->aux_op_queue.count -= done_count; memmove(queue->aux_op_queue.ops, &queue->aux_op_queue.ops[done_count], queue->aux_op_queue.count * sizeof(*queue->aux_op_queue.ops)); +} - vkd3d_mutex_lock(&queue->op_mutex); - +static HRESULT d3d12_command_queue_fixup_after_flush_locked(struct d3d12_command_queue *queue) +{ d3d12_command_queue_swap_queues(queue); d3d12_command_queue_op_array_append(&queue->op_queue, queue->aux_op_queue.count, queue->aux_op_queue.ops); @@ -6798,11 +6798,7 @@ static HRESULT d3d12_command_queue_fixup_after_flush(struct d3d12_command_queue queue->aux_op_queue.count = 0; queue->is_flushing = false; - hr = d3d12_command_queue_record_as_blocked(queue); - - vkd3d_mutex_unlock(&queue->op_mutex); - - return hr; + return d3d12_command_queue_record_as_blocked(queue); } static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, bool *flushed_any) @@ -6855,7 +6851,9 @@ static HRESULT d3d12_command_queue_flush_ops_locked(struct d3d12_command_queue * if (op->u.wait.value > fence->max_pending_value) { vkd3d_mutex_unlock(&fence->mutex); - return d3d12_command_queue_fixup_after_flush(queue, i); + d3d12_command_queue_delete_aux_ops(queue, i); + vkd3d_mutex_lock(&queue->op_mutex); + return d3d12_command_queue_fixup_after_flush_locked(queue); } d3d12_command_queue_wait_locked(queue, fence, op->u.wait.value); d3d12_fence_decref(fence);

1 0

Etaash Mathamsetty : kernelbase: Add GetPackagesByPackageFamily stub.
by Alexandre Julliard 03 May '23

03 May '23

Module: wine Branch: master Commit: bd89ab3040e30c11b34a95072d88f635ade03bdc URL: https://gitlab.winehq.org/wine/wine/-/commit/bd89ab3040e30c11b34a95072d88f6… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Wed Apr 26 15:46:57 2023 -0400 kernelbase: Add GetPackagesByPackageFamily stub. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 16ce6ffa41e..c85b2aa9f6c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -774,6 +774,7 @@ @ stdcall -import GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPackageFamilyName(long ptr ptr) kernelbase.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernelbase.GetPackageFullName +@ stdcall GetPackagesByPackageFamily(wstr ptr ptr ptr ptr) kernelbase.GetPackagesByPackageFamily @ stdcall -import GetPhysicallyInstalledSystemMemory(ptr) @ stdcall -import GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index af3af8ecabe..9fd9ad5f038 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -643,7 +643,7 @@ # @ stub GetPackageStatusForUser # @ stub GetPackageTargetPlatformProperty # @ stub GetPackageVolumeSisPath -# @ stub GetPackagesByPackageFamily +@ stdcall GetPackagesByPackageFamily(wstr ptr ptr ptr ptr) @ stdcall GetPerformanceInfo(ptr long) @ stdcall GetPhysicallyInstalledSystemMemory(ptr) # @ stub GetPreviousFgPolicyRefreshInfoInternal diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 4d5a8a4de93..8b2d0e1ee1f 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1604,6 +1604,21 @@ LONG WINAPI /* DECLSPEC_HOTPATCH */ GetPackageFamilyName( HANDLE process, UINT32 return APPMODEL_ERROR_NO_PACKAGE; } +/*********************************************************************** + * GetPackagesByPackageFamily (kernelbase.@) + */ +LONG WINAPI DECLSPEC_HOTPATCH GetPackagesByPackageFamily(const WCHAR *family_name, UINT32 *count, + WCHAR *full_names, UINT32 *buffer_len, WCHAR *buffer) +{ + FIXME( "(%s %p %p %p %p): stub\n", debugstr_w(family_name), count, full_names, buffer_len, buffer ); + + if (!count || !buffer_len) + return ERROR_INVALID_PARAMETER; + + *count = 0; + *buffer_len = 0; + return ERROR_SUCCESS; +} static const struct {

1 0

Rémi Bernon : winegstreamer: Keep a IMFMediaSource pointer in the media stream.
by Alexandre Julliard 03 May '23

03 May '23

Module: wine Branch: master Commit: 3eb9571d5f902e38a835143be9e5cee0e70a1b48 URL: https://gitlab.winehq.org/wine/wine/-/commit/3eb9571d5f902e38a835143be9e5ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 27 21:18:57 2023 +0200 winegstreamer: Keep a IMFMediaSource pointer in the media stream. --- dlls/winegstreamer/media_source.c | 42 +++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index cbd78b17118..c9fdbdcf703 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -31,7 +31,8 @@ struct media_stream { IMFMediaStream IMFMediaStream_iface; LONG ref; - struct media_source *parent_source; + + IMFMediaSource *media_source; IMFMediaEventQueue *event_queue; IMFStreamDescriptor *descriptor; @@ -288,6 +289,7 @@ static BOOL enqueue_token(struct media_stream *stream, IUnknown *token) static void flush_token_queue(struct media_stream *stream, BOOL send) { + struct media_source *source = impl_from_IMFMediaSource(stream->media_source); LONG i; for (i = 0; i < stream->token_queue_count; i++) @@ -301,8 +303,8 @@ static void flush_token_queue(struct media_stream *stream, BOOL send) command->u.request_sample.stream = stream; command->u.request_sample.token = stream->token_queue[i]; - hr = MFPutWorkItem(stream->parent_source->async_commands_queue, - &stream->parent_source->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, + &command->IUnknown_iface); } if (FAILED(hr)) WARN("Could not enqueue sample request, hr %#lx\n", hr); @@ -528,7 +530,7 @@ out: static void wait_on_sample(struct media_stream *stream, IUnknown *token) { - struct media_source *source = stream->parent_source; + struct media_source *source = impl_from_IMFMediaSource(stream->media_source); PROPVARIANT empty_var = {.vt = VT_EMPTY}; struct wg_parser_buffer buffer; @@ -542,7 +544,7 @@ static void wait_on_sample(struct media_stream *stream, IUnknown *token) { stream->eos = TRUE; IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEEndOfStream, &GUID_NULL, S_OK, &empty_var); - dispatch_end_of_presentation(stream->parent_source); + dispatch_end_of_presentation(source); } } @@ -741,17 +743,18 @@ static HRESULT WINAPI media_stream_QueueEvent(IMFMediaStream *iface, MediaEventT return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } -static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMediaSource **source) +static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMediaSource **out) { struct media_stream *stream = impl_from_IMFMediaStream(iface); + struct media_source *source = impl_from_IMFMediaSource(stream->media_source); - TRACE("%p, %p.\n", iface, source); + TRACE("%p, %p.\n", iface, out); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; - IMFMediaSource_AddRef(&stream->parent_source->IMFMediaSource_iface); - *source = &stream->parent_source->IMFMediaSource_iface; + IMFMediaSource_AddRef(&source->IMFMediaSource_iface); + *out = &source->IMFMediaSource_iface; return S_OK; } @@ -774,6 +777,7 @@ static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IM static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token) { struct media_stream *stream = impl_from_IMFMediaStream(iface); + struct media_source *source = impl_from_IMFMediaSource(stream->media_source); struct source_async_command *command; HRESULT hr; @@ -800,8 +804,7 @@ static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown IUnknown_AddRef(token); command->u.request_sample.token = token; - hr = MFPutWorkItem(stream->parent_source->async_commands_queue, - &stream->parent_source->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); } return hr; @@ -821,9 +824,10 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; -static HRESULT media_stream_create(struct media_source *source, DWORD id, +static HRESULT media_stream_create(IMFMediaSource *source, DWORD id, struct media_stream **out) { + struct wg_parser *wg_parser = impl_from_IMFMediaSource(source)->wg_parser; struct media_stream *object; HRESULT hr; @@ -841,13 +845,13 @@ static HRESULT media_stream_create(struct media_source *source, DWORD id, return hr; } - IMFMediaSource_AddRef(&source->IMFMediaSource_iface); - object->parent_source = source; + IMFMediaSource_AddRef(source); + object->media_source = source; object->stream_id = id; object->state = STREAM_INACTIVE; object->eos = FALSE; - object->wg_stream = wg_parser_get_stream(source->wg_parser, id); + object->wg_stream = wg_parser_get_stream(wg_parser, id); TRACE("Created stream object %p.\n", object); @@ -1368,7 +1372,7 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) IMFMediaEventQueue_Shutdown(stream->event_queue); IMFStreamDescriptor_Release(stream->descriptor); - IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + IMFMediaSource_Release(stream->media_source); IMFMediaStream_Release(&stream->IMFMediaStream_iface); } @@ -1475,13 +1479,13 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ for (i = 0; i < stream_count; ++i) { - if (FAILED(hr = media_stream_create(object, i, &object->streams[i]))) + if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, i, &object->streams[i]))) goto fail; if (FAILED(hr = media_stream_init_desc(object->streams[i]))) { ERR("Failed to finish initialization of media stream %p, hr %#lx.\n", object->streams[i], hr); - IMFMediaSource_Release(&object->streams[i]->parent_source->IMFMediaSource_iface); + IMFMediaSource_Release(object->streams[i]->media_source); IMFMediaEventQueue_Release(object->streams[i]->event_queue); free(object->streams[i]); goto fail; @@ -1567,7 +1571,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ IMFMediaEventQueue_Release(stream->event_queue); IMFStreamDescriptor_Release(stream->descriptor); - IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + IMFMediaSource_Release(stream->media_source); free(stream); }

1 0