November 2021 - Wine-Commits

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

Nov. 23, 2021

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

Zebediah Figura : wined3d: Allow OpenGL pixel pack buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: d7ba2085697b41c00e94701569074c6c03e30a14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ba2085697b41c00e947015… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 22 18:14:42 2021 -0600 wined3d: Allow OpenGL pixel pack buffer objects to be suballocated from a larger buffer. 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 | 7 +++++-- dlls/wined3d/texture.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9c6f5e18c28..060ac84b8b7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -420,9 +420,11 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i BYTE *row, *top, *bottom; BOOL src_is_upside_down; BYTE *mem = NULL; + uint8_t *offset; unsigned int i; wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); + offset = data.addr; restore_texture = context->current_rt.texture; restore_idx = context->current_rt.sub_resource_idx; @@ -471,6 +473,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, wined3d_bo_gl(data.buffer_object)->id)); checkGLcall("glBindBuffer"); + offset += data.buffer_object->buffer_offset; } level = sub_resource_idx % texture->level_count; @@ -484,7 +487,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); gl_info->gl_ops.gl.p_glReadPixels(0, 0, width, height, - format_gl->format, format_gl->type, data.addr); + format_gl->format, format_gl->type, offset); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */ @@ -504,7 +507,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"); } - mem += (uintptr_t)data.addr; + mem += (uintptr_t)offset; top = mem; bottom = mem + row_pitch * (height - 1); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 072092e73be..1ab50a27596 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2693,7 +2693,7 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, bo->id)); checkGLcall("glBindBuffer"); - mem = data->addr; + mem = (uint8_t *)data->addr + bo->b.buffer_offset; } else { @@ -2796,7 +2796,8 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, bo->id)); checkGLcall("glBindBuffer"); - GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, (GLintptr)data->addr, sub_resource->size, src_data)); + GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, + (GLintptr)data->addr + bo->b.buffer_offset, sub_resource->size, src_data)); checkGLcall("glBufferSubData"); } else @@ -2827,6 +2828,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, unsigned int src_level, src_width, src_height, src_depth; unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_format_gl *format_gl; + uint8_t *offset = dst_bo_addr->addr; struct wined3d_bo *dst_bo; BOOL srgb = FALSE; GLenum target; @@ -2906,22 +2908,23 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, wined3d_bo_gl(dst_bo)->id)); checkGLcall("glBindBuffer"); + offset += dst_bo->buffer_offset; } if (src_texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); + src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, offset); - GL_EXTCALL(glGetCompressedTexImage(target, src_level, dst_bo_addr->addr)); + GL_EXTCALL(glGetCompressedTexImage(target, src_level, offset)); checkGLcall("glGetCompressedTexImage"); } else { TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); + src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, offset); - gl_info->gl_ops.gl.p_glGetTexImage(target, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); + gl_info->gl_ops.gl.p_glGetTexImage(target, src_level, format_gl->format, format_gl->type, offset); checkGLcall("glGetTexImage"); }

1 0

Alexandre Julliard : makefiles: Don't use bundled libraries to build native Unix libraries.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 1ef7dd2d7c0124371e9915d707102b01a3ad27ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ef7dd2d7c0124371e9915d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 23 14:40:04 2021 +0100 makefiles: Don't use bundled libraries to build native Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d0dc9e3d01d..a5ce73ae482 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2015,9 +2015,8 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s struct strarray all_libs = empty_strarray; unsigned int i, j; - if (make->native_unix_lib && strcmp( make->unixlib, "ntdll.so" )) strarray_add( &all_libs, "-lntdll" ); + if (strcmp( make->unixlib, "ntdll.so" )) strarray_add( &all_libs, "-lntdll" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); - strarray_addall( &all_libs, libs ); for (i = 0; i < all_libs.count; i++) { @@ -2025,21 +2024,12 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s if (!strncmp( all_libs.str[i], "-l", 2 )) { - const char *name = all_libs.str[i] + 2; - for (j = 0; j < subdirs.count; j++) { if (make == submakes[j]) continue; - if ((lib = get_static_lib( submakes[j], name ))) break; + if ((lib = get_native_unix_lib( submakes[j], all_libs.str[i] + 2 ))) break; } - if (!lib && make->native_unix_lib) - for (j = 0; j < subdirs.count; j++) - { - if (make == submakes[j]) continue; - if ((lib = get_native_unix_lib( submakes[j], name ))) break; - } } - if (lib) { strarray_add( deps, lib ); @@ -2047,6 +2037,8 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s } else strarray_add( &ret, all_libs.str[i] ); } + + strarray_addall( &ret, libs ); return ret; } @@ -3145,6 +3137,12 @@ static void output_module( struct makefile *make ) strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, make->is_cross )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, 0, make->is_cross )); + if (!make->use_msvcrt) + { + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); + } + if (make->is_cross) { if (delay_load_flag) @@ -3161,7 +3159,6 @@ static void output_module( struct makefile *make ) } else if (*dll_ext) { - if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); for (i = 0; i < make->delayimports.count; i++) strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); @@ -3172,7 +3169,6 @@ static void output_module( struct makefile *make ) } else { - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); strarray_add( &make->all_targets, make->module ); add_install_rule( make, make->module, make->module, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); @@ -3316,9 +3312,10 @@ static void output_unix_lib( struct makefile *make ) if (spec_file) strarray_add( &unix_deps, spec_file ); strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); + strarray_addall( &unix_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &unix_libs, libs ); } - - strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); + else unix_libs = add_unix_libraries( make, &unix_deps ); strarray_add( &make->all_targets, make->unixlib ); add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib ));

1 0

Nikolay Sivov : dxva2: Introduce progressive processor device.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

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

Huw Davies : winecoreaudio: Move get_mix_format to the unixlib.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

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

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

Nov. 22, 2021

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 create_stream and release_stream to the unixlib.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

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

Paul Gofman : advapi32: Improve PerfCreateInstance() stub.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: eec443afc262c239c36052689431044072d28100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eec443afc262c239c3605268… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 22 17:07:58 2021 +0300 advapi32: Improve PerfCreateInstance() stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/perf.c | 63 ++++++++++++++++++++++++++-- dlls/kernelbase/main.c | 102 +++++++++++++++++++++++++++++++++++++++++---- include/perflib.h | 3 ++ 3 files changed, 157 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eec443afc262c239c360…

1 0

Dmitry Timoshkov : user32: Add exception handler to GetWindowText.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: ecd1c66476d63ca85c144a814046bdf5b86f4327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecd1c66476d63ca85c144a81… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 22 10:48:21 2021 +0300 user32: Add exception handler to GetWindowText. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 29 ++++++++++++++++++++----- dlls/user32/win.c | 57 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 67 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 88989f4064b..0156987f529 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7923,17 +7923,36 @@ static void test_gettext(void) if (0) { r = SendMessageA( hwnd, WM_GETTEXT, 0x10, 0x1000); - ok( r == 0, "settext should return zero\n"); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0x10000, 0); - ok( r == 0, "settext should return zero (%ld)\n", r); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0xff000000, 0x1000); - ok( r == 0, "settext should return zero (%ld)\n", r); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0x1000, 0xff000000); - ok( r == 0, "settext should return zero (%ld)\n", r); - } + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); + } + + /* GetWindowText doesn't crash */ + r = GetWindowTextA( hwnd, (LPSTR)0x10, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0x10000, 0 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0xff000000, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0x1000, 0xff000000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + + r = GetWindowTextW( hwnd, (LPWSTR)0x10, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0x10000, 0 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0xff000000, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0x1000, 0xff000000); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); DestroyWindow(hwnd); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 221607b3169..4f1f70d9802 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -31,6 +31,7 @@ #include "win.h" #include "controls.h" #include "winerror.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -2999,22 +3000,35 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) { WCHAR *buffer; + int ret = 0; if (!lpString || nMaxCount <= 0) return 0; - if (WIN_IsCurrentProcess( hwnd )) + __TRY { lpString[0] = 0; - return (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + + if (WIN_IsCurrentProcess( hwnd )) + { + ret = (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else if ((buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) + { + /* when window belongs to other process, don't send a message */ + get_server_window_text( hwnd, buffer, nMaxCount ); + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) + lpString[nMaxCount-1] = 0; + HeapFree( GetProcessHeap(), 0, buffer ); + ret = strlen(lpString); + } } + __EXCEPT_PAGE_FAULT + { + ret = 0; + } + __ENDTRY - /* when window belongs to other process, don't send a message */ - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) return 0; - get_server_window_text( hwnd, buffer, nMaxCount ); - if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) - lpString[nMaxCount-1] = 0; - HeapFree( GetProcessHeap(), 0, buffer ); - return strlen(lpString); + return ret; } @@ -3047,17 +3061,32 @@ INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount ) */ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) { + int ret; + if (!lpString || nMaxCount <= 0) return 0; - if (WIN_IsCurrentProcess( hwnd )) + __TRY { lpString[0] = 0; - return (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + + if (WIN_IsCurrentProcess( hwnd )) + { + ret = (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else + { + /* when window belongs to other process, don't send a message */ + get_server_window_text( hwnd, lpString, nMaxCount ); + ret = lstrlenW(lpString); + } } + __EXCEPT_PAGE_FAULT + { + ret = 0; + } + __ENDTRY - /* when window belongs to other process, don't send a message */ - get_server_window_text( hwnd, lpString, nMaxCount ); - return lstrlenW(lpString); + return ret; }

1 0

Huw Davies : winecoreaudio: Move creation of the audio unit to IAudioClient_Initialize().
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 3810c693cacf7a8b763d32505a49bf70b151d169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3810c693cacf7a8b763d3250… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:33 2021 +0000 winecoreaudio: Move creation of the audio unit to IAudioClient_Initialize(). 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 642610b4b60..56f533f8bc1 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -580,12 +580,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->adevid = adevid; - if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ - HeapFree(GetProcessHeap(), 0, This->stream); - HeapFree(GetProcessHeap(), 0, This); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - *out = (IAudioClient *)&This->IAudioClient3_iface; IAudioClient3_AddRef(&This->IAudioClient3_iface); @@ -1262,6 +1256,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) This->stream->bufsize_frames -= This->stream->bufsize_frames % This->stream->period_frames; + if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + hr = ca_setup_audiounit(This->dataflow, This->stream->unit, This->stream->fmt, &This->stream->dev_desc, &This->stream->converter); if(FAILED(hr)){ CoTaskMemFree(This->stream->fmt);

1 0