wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Zebediah Figura : wined3d: Respect the BO address offset when flipping the framebuffer in software.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: f059a25af11947b9bd53e3f32efda8d7873f8126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f059a25af11947b9bd53e3f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 22 18:14:41 2021 -0600 wined3d: Respect the BO address offset when flipping the framebuffer in software. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 79dc0bd06b6..9c6f5e18c28 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -419,8 +419,8 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i unsigned int restore_idx; BYTE *row, *top, *bottom; BOOL src_is_upside_down; + BYTE *mem = NULL; unsigned int i; - BYTE *mem; wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); @@ -504,8 +504,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i mem = GL_EXTCALL(glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_WRITE)); checkGLcall("glMapBuffer"); } - else - mem = data.addr; + mem += (uintptr_t)data.addr; top = mem; bottom = mem + row_pitch * (height - 1);

1 0

Nikolay Sivov : d3d10/effect: Fix freed register table pointer (Coverity).
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 2fd283e968bfd75424279387ae479a7bfaafcd5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd283e968bfd75424279387… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 21 19:45:16 2021 +0300 d3d10/effect: Fix freed register table pointer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 04250a1663e..b9992f84a8b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -305,7 +305,7 @@ static void d3d10_effect_preshader_clear(struct d3d10_effect_preshader *p) unsigned int i; for (i = 0; i < ARRAY_SIZE(p->reg_tables); ++i) - heap_free(&p->reg_tables[i].f); + heap_free(p->reg_tables[i].f); if (p->code) ID3D10Blob_Release(p->code); heap_free(p->vars);

1 0

Nikolay Sivov : dxva2: Introduce progressive processor device.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 12a1b4b360abc6db5de2e393b9ec53a77f532ffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a1b4b360abc6db5de2e393… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 23 15:21:45 2021 +0300 dxva2: Introduce progressive processor device. The point is to provide a device, with similar caps and NV12 support, while keeping software device on its own, the way it should be. This is based on research by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 126 ++++++++++++++++++++++++++++++++------- dlls/dxva2/tests/dxva2.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/mixer.c | 2 + 3 files changed, 257 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12a1b4b360abc6db5de2…

1 0

Hugh McMaster : conhost: Only use the maximum character width if a double-byte character set is in use.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 996126b2deccaad8c61f5d72d9c322fb7fb56a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=996126b2deccaad8c61f5d72… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Nov 23 22:14:08 2021 +1100 conhost: Only use the maximum character width if a double-byte character set is in use. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 319463537d5..7ad0d48effd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -646,7 +646,7 @@ static HFONT select_font_config( struct console_config *config, unsigned int cp, lstrcpyW( config->face_name, lf->lfFaceName ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize == 2) config->cell_width = tm.tmMaxCharWidth; return font; @@ -713,7 +713,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2) font_info->width = tm.tmMaxCharWidth; if (console->window->font) DeleteObject( console->window->font );

1 0

Andrey Gusev : winecoreaudio.drv: Place output message before return statement.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: b5b77ed6acad6a20bd4c5bfc98cfce178eef1d0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b77ed6acad6a20bd4c5bfc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 22 15:12:56 2021 +0200 winecoreaudio.drv: Place output message before return statement. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 7ec282c514d..2ad2938a5d8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1625,8 +1625,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(*ppv) hr = S_OK; else{ - return E_NOINTERFACE; FIXME("stub %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } end:

1 0

Huw Davies : winecoreaudio: Move get_mix_format to the unixlib.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: bdbb8591c63f445f35031ce90af45c79027190cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdbb8591c63f445f35031ce9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:38 2021 +0000 winecoreaudio: Move get_mix_format to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 246 +++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 256 ++----------------------------------- dlls/winecoreaudio.drv/unixlib.h | 9 ++ 3 files changed, 267 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdbb8591c63f445f3503…

1 0

Huw Davies : winecoreaudio: Move create_stream and release_stream to the unixlib.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 129c7fafe6e8ae40b2021a73912bda02a41f4d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=129c7fafe6e8ae40b2021a73… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:37 2021 +0000 winecoreaudio: Move create_stream and release_stream to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 464 +++++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 304 ++++-------------------- dlls/winecoreaudio.drv/unixlib.h | 20 ++ 3 files changed, 527 insertions(+), 261 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=129c7fafe6e8ae40b202…

1 0

Huw Davies : winecoreaudio: Use the presence of stream to indicate the init state.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: d5361a8b470d37a8ffc05cd0b3984eefa938c301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5361a8b470d37a8ffc05cd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:36 2021 +0000 winecoreaudio: Use the presence of stream to indicate the init state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 211 +++++++++++++++++--------------------- 1 file changed, 93 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5361a8b470d37a8ffc0…

1 0

Huw Davies : winecoreaudio: Pass the stream separately to ca_setvol().
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 3599e011404824f0a8f863e6401aa193e5f25ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3599e011404824f0a8f863e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:35 2021 +0000 winecoreaudio: Pass the stream separately to ca_setvol(). This is a temporary measure that will enable the client volumes to be initialized without having the stream set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index abe77d11ee9..1e678b08c5b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -178,7 +178,7 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT ca_setvol(ACImpl *This, UINT32 index); +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { @@ -1382,7 +1382,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, -1); + ca_setvol(This, This->stream, -1); This->initted = TRUE; @@ -2978,7 +2978,7 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = }; /* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT ca_setvol(ACImpl *This, UINT32 index) +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index) { Float32 level; OSStatus sc; @@ -2989,7 +2989,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) if(index == (UINT32)-1){ UINT32 i; level = 1.; - for(i = 0; i < This->stream->fmt->nChannels; ++i){ + for(i = 0; i < stream->fmt->nChannels; ++i){ Float32 tmp; tmp = This->session->master_vol * This->session->channel_vols[i] * This->vols[i]; @@ -3000,7 +3000,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; } - sc = AudioUnitSetParameter(This->stream->unit, kHALOutputParam_Volume, + sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, level, 0); if(sc != noErr) WARN("Couldn't set volume: %x\n", (int)sc); @@ -3015,7 +3015,7 @@ static HRESULT ca_session_setvol(AudioSession *session, UINT32 index) LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ HRESULT hr; - hr = ca_setvol(client, index); + hr = ca_setvol(client, client->stream, index); if(FAILED(hr)) ret = hr; } @@ -3214,7 +3214,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_setvol(This, index); + ret = ca_setvol(This, This->stream, index); LeaveCriticalSection(&g_sessions_lock); @@ -3259,7 +3259,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = ca_setvol(This, -1); + ret = ca_setvol(This, This->stream, -1); LeaveCriticalSection(&g_sessions_lock);

1 0

Huw Davies : winecoreaudio: Pass the stream directly to silence_buffer().
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 0136bf7acd25bc6ecbac84e628639e045769cc23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0136bf7acd25bc6ecbac84e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:34 2021 +0000 winecoreaudio: Pass the stream directly to silence_buffer(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 56f533f8bc1..abe77d11ee9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -877,16 +877,16 @@ static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, memcpy(dst + dst_offs, src, src_bytes); } -static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->stream->fmt; - if((This->stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->stream->fmt->nBlockAlign); +static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->stream->fmt->nBlockAlign); + memset(buffer, 0, frames * stream->fmt->nBlockAlign); } /* CA is pulling data from us */ @@ -919,7 +919,7 @@ static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, to_copy_bytes = to_copy_frames = 0; if(nframes > to_copy_frames) - silence_buffer(This, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); + silence_buffer(This->stream, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); OSSpinLockUnlock(&This->stream->lock); @@ -1344,7 +1344,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); - silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); + silence_buffer(This->stream, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ This->stream->cap_bufsize_frames = MulDiv(duration, This->stream->dev_desc.mSampleRate, 10000000); @@ -2318,7 +2318,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->stream->getbuf_last = frames; } - silence_buffer(This, *data, frames); + silence_buffer(This->stream, *data, frames); OSSpinLockUnlock(&This->stream->lock); @@ -2357,7 +2357,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buffer = This->stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This, buffer, frames); + silence_buffer(This->stream, buffer, frames); if(This->stream->getbuf_last < 0) ca_wrap_buffer(This->stream->local_buffer,

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021