December 2020 - Wine-Commits

Henri Verbeet : wined3d: Do not create Vulkan 2D (array) views for UAVs on 3D resources.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: afac4f09c70e7bde056f9618f5f05b40065df795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afac4f09c70e7bde056f9618… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 17:23:36 2020 +0330 wined3d: Do not create Vulkan 2D (array) views for UAVs on 3D resources. We should simply create 3D views. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f2c8ceab461..c3128c9ed4c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -688,7 +688,7 @@ static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk *context_vk, const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk, - const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool srv) + const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool rtv) { const struct wined3d_resource *resource = &texture_vk->t.resource; const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -730,7 +730,7 @@ static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk create_info.flags = 0; create_info.image = texture_vk->vk_image; create_info.viewType = vk_image_view_type_from_wined3d(resource->type, desc->flags); - if (!srv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) + if (rtv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) { if (desc->u.texture.layer_count > 1) create_info.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; @@ -823,7 +823,7 @@ static void wined3d_render_target_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); view_vk->vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), - desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, false); + desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, true); context_release(context); if (!view_vk->vk_image_view) @@ -1098,7 +1098,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), - desc, texture_vk, wined3d_format_vk(format), format->color_fixup, true); + desc, texture_vk, wined3d_format_vk(format), format->color_fixup, false); context_release(context); if (!vk_image_view)

1 0

Jacek Caban : msvcrt: Prefix *rot* functions.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: e8936e79c20f09156afe8ecac0fe9cde87905a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8936e79c20f09156afe8eca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 13:50:33 2020 +0100 msvcrt: Prefix *rot* functions. MSVC does not allow overriding those intrinsic functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 12 ++++++------ dlls/msvcr90/msvcr90.spec | 12 ++++++------ dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 12 ++++++------ 12 files changed, 64 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8936e79c20f09156afe…

1 0

Jacek Caban : ucrtbase: Improve __intrinsic_abnormal_termination stub.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: e734d729461855a5ddaf81f4e08e0cc2b3286e37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e734d729461855a5ddaf81f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 13:50:15 2020 +0100 ucrtbase: Improve __intrinsic_abnormal_termination stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 2a912bba7bf..136358a174c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -38,7 +38,7 @@ @ cdecl __current_exception_context() ucrtbase.__current_exception_context @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment -@ stub __intrinsic_abnormal_termination +@ cdecl __intrinsic_abnormal_termination() ucrtbase.__intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ cdecl __processing_throw() ucrtbase.__processing_throw diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index efa5c022808..ce1bbc9d5b7 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -38,7 +38,7 @@ @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln_dll MSVCRT__acmdln @ extern _aexit_rtn_dll _aexit_rtn diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3c27eda4652..c7a458950c7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -676,7 +676,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 10258b032d1..90125fed340 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1024,7 +1024,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4e5f6520caf..bb66b83739d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1014,7 +1014,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2851c42d7c8..bf5f61484fe 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -209,7 +209,7 @@ @ cdecl __wcserror(wstr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 6a60a7d5827..9a97c41cbe9 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -204,7 +204,7 @@ @ cdecl __wcserror(wstr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5634e34d5ff..1159876f235 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -325,7 +325,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8151b4ddd3c..d115d2f9eed 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -309,7 +309,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 3cc8b9c92ea..8130e34b2c4 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -281,7 +281,7 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) /********************************************************************* * _abnormal_termination (MSVCRT.@) */ -int CDECL _abnormal_termination(void) +int CDECL __intrinsic_abnormal_termination(void) { FIXME("(void)stub\n"); return 0; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6f256a2d58e..a425ff8aa6d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -295,7 +295,7 @@ # stub __wcsncnt(wstr long) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 503a13180ba..5fda5332f62 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -197,7 +197,7 @@ @ extern __wargv MSVCRT___wargv @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3c8afa86c0d..35925d4ebe5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -92,7 +92,7 @@ @ cdecl __fpe_flt_rounds() @ cdecl __fpecode() @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init -@ stub __intrinsic_abnormal_termination +@ cdecl __intrinsic_abnormal_termination() @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex @ cdecl __isascii(long)

1 0

Jacek Caban : msvcrt: Use GCC-style assembly on Clang MSVC target.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: 05806e0edb05a2bc594201947d3637bcbf126d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=05806e0edb05a2bc59420194… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 18:10:04 2020 +0100 msvcrt: Use GCC-style assembly on Clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 14 +++++++------- dlls/msvcrt/misc.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e5dd9cb2b8a..e6e837e52c6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1297,7 +1297,7 @@ double CDECL tanh( double x ) } -#if defined(__GNUC__) && defined(__i386__) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define CREATE_FPU_FUNC1(name, call) \ __ASM_GLOBAL_FUNC(name, \ @@ -1411,7 +1411,7 @@ __ASM_GLOBAL_FUNC(_ftol, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret") -#endif /* defined(__GNUC__) && defined(__i386__) */ +#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ /********************************************************************* * _fpclass (MSVCRT.@) @@ -1638,7 +1638,7 @@ double CDECL modf( double x, double *iptr ) #if defined(__i386__) || defined(__x86_64__) void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) unsigned int flags; unsigned long fpword; @@ -1710,7 +1710,7 @@ unsigned int CDECL _statusfp(void) unsigned int CDECL _clearfp(void) { unsigned int flags = 0; -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) unsigned long fpword; __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); @@ -1802,7 +1802,7 @@ double CDECL _chgsign(double num) int CDECL __control87_2( unsigned int newval, unsigned int mask, unsigned int *x86_cw, unsigned int *sse2_cw ) { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) unsigned long fpword; unsigned int flags; unsigned int old_flags; @@ -2152,7 +2152,7 @@ int CDECL _finite(double num) */ void CDECL _fpreset(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) const unsigned int x86_cw = 0x27f; __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); if (sse2_supported) @@ -2171,7 +2171,7 @@ void CDECL _fpreset(void) */ int CDECL fesetenv(const fenv_t *env) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) struct { WORD control_word; WORD unused1; diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 17019e9f5a7..5ea1ddfc6c7 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -213,7 +213,7 @@ void* CDECL bsearch(const void *key, const void *base, size_t nmemb, */ #ifdef __i386__ -# ifdef __GNUC__ +# if defined(__GNUC__) || defined(__clang__) __ASM_GLOBAL_FUNC(_chkesp, "jnz 1f\n\t" @@ -242,7 +242,7 @@ void CDECL DECLSPEC_HIDDEN chkesp_fail(void) DebugBreak(); } -# else /* __GNUC__ */ +# else /* __GNUC__ || __clang__ */ /**********************************************************************/ @@ -250,7 +250,7 @@ void CDECL _chkesp(void) { } -# endif /* __GNUC__ */ +# endif /* __GNUC__ || __clang__ */ #endif /* __i386__ */

1 0

Jacek Caban : conhost: Don't create bitmap for hidden windows.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: 9e62d7d2576bd8b1db89bfc9b4056b528faeda5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e62d7d2576bd8b1db89bfc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 22:18:03 2020 +0100 conhost: Don't create bitmap for hidden windows. Fixes performance issues in ConEmu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index f5cf8e434c3..ed806c379d3 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -385,7 +385,7 @@ static void fill_mem_dc( struct console *console, const RECT *update ) INT *dx; RECT r; - if (!console->window->font) + if (!console->window->font || !console->window->bitmap) return; if (!(line = malloc( (update->right - update->left + 1) * sizeof(WCHAR))) ) return; @@ -479,7 +479,7 @@ static void update_window( struct console *console ) if (console->window->sb_width != console->active->width || console->window->sb_height != console->active->height || - !console->window->bitmap) + (!console->window->bitmap && IsWindowVisible( console->win ))) { console->window->sb_width = console->active->width; console->window->sb_height = console->active->height; @@ -2189,6 +2189,16 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp break; } + case WM_SHOWWINDOW: + if (wparam) + update_window( console ); + else + { + if (console->window->bitmap) DeleteObject( console->window->bitmap ); + console->window->bitmap = NULL; + } + break; + case WM_KEYDOWN: case WM_KEYUP: if (console->window->in_selection)

1 0

Jacek Caban : conhost: Improve get_output_info debug traces.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: ef876fc54e207344b5809f40a59e3d5d610a6fda URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef876fc54e207344b5809f40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 22:18:11 2020 +0100 conhost: Improve get_output_info debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0548fcaafd3..4b156f21ea3 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1702,8 +1702,6 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou { struct condrv_output_info *info; - TRACE( "%p\n", screen_buffer ); - *out_size = min( *out_size, sizeof(*info) + screen_buffer->font.face_len ); if (!(info = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; @@ -1727,6 +1725,12 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou info->font_pitch_family = screen_buffer->font.pitch_family; memcpy( info->color_map, screen_buffer->color_map, sizeof(info->color_map) ); if (*out_size > sizeof(*info)) memcpy( info + 1, screen_buffer->font.face_name, *out_size - sizeof(*info) ); + + TRACE( "%p cursor_size=%u cursor_visible=%x cursor=(%u,%u) width=%u height=%u win=%s attr=%x popup_attr=%x" + " font_width=%u font_height=%u %s\n", screen_buffer, info->cursor_size, info->cursor_visible, + info->cursor_x, info->cursor_y, info->width, info->height, wine_dbgstr_rect(&screen_buffer->win), + info->attr, info->popup_attr, info->font_width, info->font_height, + debugstr_wn( (const WCHAR *)(info + 1), (*out_size - sizeof(*info)) / sizeof(WCHAR) ) ); return STATUS_SUCCESS; }

1 0

Paul Gofman : ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: f17404f8ed2883e28ef33887c7e0a9c2fc2e4874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17404f8ed2883e28ef33887… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 16 11:58:27 2020 +0300 ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST. Fixes out of bound memory access in Anno 1404 Addon. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6cb35bcd135..05097ce53b8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4618,10 +4618,11 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (ptr->IpAddressList.IpAddress.String[0] == '\0') continue; - if ((numInt + 1)*sizeof(INTERFACE_INFO)/sizeof(IP_ADAPTER_INFO) > out_size) + if ((numInt + 1) * sizeof(INTERFACE_INFO) > out_size) { WARN("Buffer too small = %u, out_size = %u\n", numInt + 1, out_size); status = WSAEFAULT; + if (ret_size) *ret_size = 0; break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8711b65fcea..98cc3881853 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10514,6 +10514,30 @@ static void test_WSCGetProviderPath(void) ok(len == 256, "Got unexpected len %d.\n", len); } +static void test_wsaioctl(void) +{ + char buffer[4096]; + DWORD size; + SOCKET s; + int ret; + + s = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(s != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(buffer), &size, NULL, NULL); + ok(!ret, "Got unexpected ret %d.\n", ret); + ok(size && size != 0xdeadbeef && !(size % sizeof(INTERFACE_INFO)), "Got unexpected size %u.\n", size); + + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO), &size, NULL, NULL); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(!size, "Got unexpected size %u.\n", size); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -10595,6 +10619,7 @@ START_TEST( sock ) /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl(); + test_wsaioctl(); Exit(); }

1 0

Biswapriyo Nath : include: Add IAudioAmbisonicsControl interface in audioclient.idl.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: 79e2672858c1643d12c9a2b2b179b001da568029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e2672858c1643d12c9a2b2… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Dec 15 15:26:54 2020 +0530 include: Add IAudioAmbisonicsControl interface in audioclient.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index e1a4200730f..754ae58f78c 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -361,6 +361,32 @@ typedef struct AMBISONICS_PARAMS UINT32 *pu32ChannelMap; } AMBISONICS_PARAMS; +[ + local, + pointer_default(unique), + uuid(28724c91-df35-4856-9f76-d6a26413f3df), + object, +] +interface IAudioAmbisonicsControl : IUnknown +{ + HRESULT SetData( + [in] const AMBISONICS_PARAMS *param, + [in] UINT32 size + ); + HRESULT SetHeadTracking( + [in] BOOL enable + ); + HRESULT GetHeadTracking( + [out] BOOL *enable + ); + HRESULT SetRotation( + [in] float x, + [in] float y, + [in] float z, + [in] float w + ); +} + [ local, pointer_default(unique),

1 0

Biswapriyo Nath : include: Add AUDCLNT_STREAMOPTIONS_AMBISONICS in audioclient.idl.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: 82bea03ff9dff19347a6d39d9ce9dd94e1a8e981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82bea03ff9dff19347a6d39d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Dec 15 15:26:54 2020 +0530 include: Add AUDCLNT_STREAMOPTIONS_AMBISONICS in audioclient.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/audioclient.idl b/include/audioclient.idl index cd13be5d575..48bdbdcdcd4 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -113,10 +113,12 @@ interface IAudioClient : IUnknown typedef enum _AUDCLNT_STREAMOPTIONS { - AUDCLNT_STREAMOPTIONS_NONE = 0, - AUDCLNT_STREAMOPTIONS_RAW = 1, - AUDCLNT_STREAMOPTIONS_MATCH_FORMAT = 2, + AUDCLNT_STREAMOPTIONS_NONE = 0x0, + AUDCLNT_STREAMOPTIONS_RAW = 0x1, + AUDCLNT_STREAMOPTIONS_MATCH_FORMAT = 0x2, + AUDCLNT_STREAMOPTIONS_AMBISONICS = 0x4 } AUDCLNT_STREAMOPTIONS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(AUDCLNT_STREAMOPTIONS);") typedef struct _AudioClientProperties {

1 0

Henri Verbeet : wined3d: Zero-initialise context_vk in wined3d_context_vk_init().
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: 353e84015bf18efd7031ff80822c16b26cc6c238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=353e84015bf18efd7031ff80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:02:20 2020 +0330 wined3d: Zero-initialise context_vk in wined3d_context_vk_init(). wined3d_context_vk_init() assumes zero-initialised memory, but that's not necessarily true in case we previously went through an adapter_vk_init_3d()/adapter_vk_uninit_3d() pair. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 9db363172f1..2d80c59ca32 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3158,6 +3158,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); + memset(context_vk, 0, sizeof(*context_vk)); wined3d_context_init(&context_vk->c, swapchain); device_vk = wined3d_device_vk(swapchain->device); adapter_vk = wined3d_adapter_vk(device_vk->d.adapter);

1 0