November 2020 - Wine-Commits

Piotr Caban : msvcrt: Use EOF from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 8180f4001a6d5a0befe6dfb4c0c3118853b7a413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8180f4001a6d5a0befe6dfb4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:09 2020 +0100 msvcrt: Use EOF from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 18 ++++++------- dlls/msvcrt/file.c | 74 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/scanf.h | 4 +-- dlls/msvcrt/wcs.c | 4 +-- 6 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8180f4001a6d5a0befe6…

1 0

Piotr Caban : msvcrt: Use _onexit_table_t from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: babe6ceb7f7b206ce8181e35934fc0aa1ee02ae5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babe6ceb7f7b206ce8181e35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:30 2020 +0100 msvcrt: Use _onexit_table_t from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 37 +++++++++++++++++++------------------ dlls/msvcrt/msvcrt.h | 8 -------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index df0b4636207..8e175859153 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <process.h> #include <stdio.h> #include "msvcrt.h" #include "mtdll.h" @@ -31,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static MSVCRT_purecall_handler purecall_handler = NULL; -static MSVCRT__onexit_table_t MSVCRT_atexit_table; +static _onexit_table_t MSVCRT_atexit_table; typedef void (__stdcall *_tls_callback_type)(void*,ULONG,void*); static _tls_callback_type tls_atexit_callback; @@ -53,7 +54,7 @@ static int MSVCRT_error_mode = MSVCRT__OUT_TO_DEFAULT; void (*CDECL _aexit_rtn)(int) = MSVCRT__exit; -static int initialize_onexit_table(MSVCRT__onexit_table_t *table) +static int initialize_onexit_table(_onexit_table_t *table) { if (!table) return -1; @@ -63,7 +64,7 @@ static int initialize_onexit_table(MSVCRT__onexit_table_t *table) return 0; } -static int register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func) +static int register_onexit_function(_onexit_table_t *table, _onexit_t func) { if (!table) return -1; @@ -86,7 +87,7 @@ static int register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi if (table->_last == table->_end) { int len = table->_end - table->_first; - MSVCRT__onexit_t *tmp = MSVCRT_realloc(table->_first, 2 * len * sizeof(void *)); + _PVFV *tmp = MSVCRT_realloc(table->_first, 2 * len * sizeof(void *)); if (!tmp) { WARN("failed to grow table.\n"); @@ -98,16 +99,16 @@ static int register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi table->_last = table->_first + len; } - *table->_last = func; + *table->_last = (_PVFV)func; table->_last++; LeaveCriticalSection(&MSVCRT_onexit_cs); return 0; } -static int execute_onexit_table(MSVCRT__onexit_table_t *table) +static int execute_onexit_table(_onexit_table_t *table) { - MSVCRT__onexit_t *func; - MSVCRT__onexit_table_t copy; + _onexit_table_t copy; + _PVFV *func; if (!table) return -1; @@ -145,9 +146,9 @@ static void call_atexit(void) /********************************************************************* * __dllonexit (MSVCRT.@) */ -MSVCRT__onexit_t CDECL __dllonexit(MSVCRT__onexit_t func, MSVCRT__onexit_t **start, MSVCRT__onexit_t **end) +_onexit_t CDECL __dllonexit(_onexit_t func, _onexit_t **start, _onexit_t **end) { - MSVCRT__onexit_t *tmp; + _onexit_t *tmp; int len; TRACE("(%p,%p,%p)\n", func, start, end); @@ -336,7 +337,7 @@ void CDECL MSVCRT__cexit(void) /********************************************************************* * _onexit (MSVCRT.@) */ -MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) +_onexit_t CDECL MSVCRT__onexit(_onexit_t func) { TRACE("(%p)\n",func); @@ -380,11 +381,11 @@ void CDECL MSVCRT_exit(int exitcode) int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) { TRACE("(%p)\n", func); - return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; + return MSVCRT__onexit((_onexit_t)func) == (_onexit_t)func ? 0 : -1; } #if _MSVCR_VER >= 140 -static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; +static _onexit_table_t MSVCRT_quick_exit_table; /********************************************************************* * _crt_at_quick_exit (UCRTBASE.@) @@ -392,7 +393,7 @@ static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) { TRACE("(%p)\n", func); - return register_onexit_function(&MSVCRT_quick_exit_table, (MSVCRT__onexit_t)func); + return register_onexit_function(&MSVCRT_quick_exit_table, (_onexit_t)func); } /********************************************************************* @@ -412,13 +413,13 @@ void CDECL MSVCRT_quick_exit(int exitcode) int CDECL MSVCRT__crt_atexit(void (__cdecl *func)(void)) { TRACE("(%p)\n", func); - return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; + return MSVCRT__onexit((_onexit_t)func) == (_onexit_t)func ? 0 : -1; } /********************************************************************* * _initialize_onexit_table (UCRTBASE.@) */ -int CDECL MSVCRT__initialize_onexit_table(MSVCRT__onexit_table_t *table) +int CDECL MSVCRT__initialize_onexit_table(_onexit_table_t *table) { TRACE("(%p)\n", table); @@ -428,7 +429,7 @@ int CDECL MSVCRT__initialize_onexit_table(MSVCRT__onexit_table_t *table) /********************************************************************* * _register_onexit_function (UCRTBASE.@) */ -int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func) +int CDECL MSVCRT__register_onexit_function(_onexit_table_t *table, _onexit_t func) { TRACE("(%p %p)\n", table, func); @@ -438,7 +439,7 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT /********************************************************************* * _execute_onexit_table (UCRTBASE.@) */ -int CDECL MSVCRT__execute_onexit_table(MSVCRT__onexit_table_t *table) +int CDECL MSVCRT__execute_onexit_table(_onexit_table_t *table) { TRACE("(%p)\n", table); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d154d9757d8..43dad306e58 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -36,7 +36,6 @@ typedef void (__cdecl *unexpected_function)(void); typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); void __cdecl terminate(void); -typedef int (__cdecl *MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); typedef void (__cdecl *MSVCRT_purecall_handler)(void); typedef void (__cdecl *MSVCRT_security_error_handler)(int, void *); @@ -93,13 +92,6 @@ typedef struct threadmbcinfostruct { unsigned char mbcasemap[256]; } threadmbcinfo; -typedef struct MSVCRT__onexit_table_t -{ - MSVCRT__onexit_t *_first; - MSVCRT__onexit_t *_last; - MSVCRT__onexit_t *_end; -} MSVCRT__onexit_table_t; - typedef struct _frame_info { void *object;

1 0

Piotr Caban : msvcrt: Use printf and scanf flags from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: eb6f79f96a81371d328476d255e27d3a47925b13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb6f79f96a81371d328476d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:33 2020 +0100 msvcrt: Use printf and scanf flags from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 25 ++++++++++++------------- dlls/msvcrt/printf.h | 8 ++++---- dlls/msvcrt/scanf.c | 12 ++++++------ dlls/msvcrt/wcs.c | 8 ++++---- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 43dad306e58..6c7d1c291d1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -23,6 +23,7 @@ #include <errno.h> #include <stdarg.h> #include <stdint.h> +#include <stdio.h> #include <wchar.h> #include "windef.h" @@ -1020,23 +1021,21 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UNDNAME_NO_SPECIAL_SYMS (0x4000) #define UNDNAME_NO_COMPLEX_TYPE (0x8000) -#define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) -#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) -#define UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS (0x0004) -#define UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY (0x0008) -#define UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS (0x0010) -#define UCRTBASE_PRINTF_STANDARD_ROUNDING (0x0020) - -#define UCRTBASE_PRINTF_MASK (0x003F) +#define UCRTBASE_PRINTF_MASK ( \ + _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION | \ + _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR | \ + _CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS | \ + _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY | \ + _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS | \ + _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING ) #define MSVCRT_PRINTF_POSITIONAL_PARAMS (0x0100) #define MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER (0x0200) -#define UCRTBASE_SCANF_SECURECRT (0x0001) -#define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) -#define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - -#define UCRTBASE_SCANF_MASK (0x0007) +#define UCRTBASE_SCANF_MASK ( \ + _CRT_INTERNAL_SCANF_SECURECRT | \ + _CRT_INTERNAL_SCANF_LEGACY_WIDE_SPECIFIERS | \ + _CRT_INTERNAL_SCANF_LEGACY_MSVCRT_COMPATIBILITY ) #define COOPERATIVE_TIMEOUT_INFINITE ((unsigned int)-1) #define COOPERATIVE_WAIT_TIMEOUT ~0 diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index c3f833bffb9..bfcf0378793 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -960,10 +960,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API BOOL positional_params = options & MSVCRT_PRINTF_POSITIONAL_PARAMS; BOOL invoke_invalid_param_handler = options & MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER; #if _MSVCR_VER >= 140 - BOOL legacy_wide = options & UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS; - BOOL legacy_msvcrt_compat = options & UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; - BOOL three_digit_exp = options & UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS; - BOOL standard_rounding = options & UCRTBASE_PRINTF_STANDARD_ROUNDING; + BOOL legacy_wide = options & _CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS; + BOOL legacy_msvcrt_compat = options & _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; + BOOL three_digit_exp = options & _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS; + BOOL standard_rounding = options & _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING; #else BOOL legacy_wide = TRUE, legacy_msvcrt_compat = TRUE; BOOL three_digit_exp = MSVCRT__get_output_format() != MSVCRT__TWO_DIGIT_EXPONENT; diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 4deac62ac7f..a09619ed0e5 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -674,7 +674,7 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, * but parsing of those isn't implemented at all yet. */ if (options & ~UCRTBASE_SCANF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - if (options & UCRTBASE_SCANF_SECURECRT) + if (options & _CRT_INTERNAL_SCANF_SECURECRT) return MSVCRT_vsnscanf_s_l(input, length, format, locale, valist); else return MSVCRT_vsnscanf_l(input, length, format, locale, valist); @@ -694,7 +694,7 @@ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, * but parsing of those isn't implemented at all yet. */ if (options & ~UCRTBASE_SCANF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - if (options & UCRTBASE_SCANF_SECURECRT) + if (options & _CRT_INTERNAL_SCANF_SECURECRT) return MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); else return MSVCRT_vsnwscanf_l(input, length, format, locale, valist); @@ -709,9 +709,9 @@ int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options, _locale_t locale, __ms_va_list valist) { - if (options & ~UCRTBASE_SCANF_SECURECRT) + if (options & ~_CRT_INTERNAL_SCANF_SECURECRT) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - if (options & UCRTBASE_SCANF_SECURECRT) + if (options & _CRT_INTERNAL_SCANF_SECURECRT) return MSVCRT_vfscanf_s_l(file, format, locale, valist); else return MSVCRT_vfscanf_l(file, format, locale, valist); @@ -726,9 +726,9 @@ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, _locale_t locale, __ms_va_list valist) { - if (options & ~UCRTBASE_SCANF_SECURECRT) + if (options & ~_CRT_INTERNAL_SCANF_SECURECRT) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - if (options & UCRTBASE_SCANF_SECURECRT) + if (options & _CRT_INTERNAL_SCANF_SECURECRT) return MSVCRT_vfwscanf_s_l(file, format, locale, valist); else return MSVCRT_vfwscanf_l(file, format, locale, valist); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 55f6dcd5530..e494d45e003 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -896,11 +896,11 @@ int CDECL __stdio_common_vsprintf( unsigned __int64 options, char *str, size_t l if(!str) return ret; - if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + if(options & _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { if(len) str[len-1] = 0; - if(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + if(options & _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR) return ret; return len > 0 ? -2 : -1; } @@ -1509,11 +1509,11 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, if(!str) return ret; - if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + if(options & _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { if(len) str[len-1] = 0; - if(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + if(options & _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR) return ret; return len > 0 ? -2 : -1; }

1 0

Piotr Caban : msvcrt: Use locale category definiotion from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: e9a1ff11302bbcbb3db68fa4bbd827a7958067ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a1ff11302bbcbb3db68fa4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:48 2020 +0100 msvcrt: Use locale category definiotion from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 7 +- dlls/msvcrt/locale.c | 226 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/msvcrt.h | 9 -- dlls/msvcrt/string.c | 28 +++---- dlls/msvcrt/wcs.c | 30 +++---- 5 files changed, 146 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9a1ff11302bbcbb3db6…

1 0

Matteo Bruni : wined3d: Introduce wined3d_context_gl_destroy_bo().
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 0638d50b22f6192be734694634050523ea01d5d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0638d50b22f6192be7346946… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 30 18:29:21 2020 +0330 wined3d: Introduce wined3d_context_gl_destroy_bo(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/buffer.c | 5 +---- dlls/wined3d/context_gl.c | 12 ++++++++++++ dlls/wined3d/texture.c | 14 +++++--------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 140948beb6d..cb382cd6734 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4778,7 +4778,7 @@ static void wined3d_view_gl_destroy_object(void *object) gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); } if (counter_id) - GL_EXTCALL(glDeleteBuffers(1, &counter_id)); + wined3d_context_gl_destroy_bo(wined3d_context_gl(context), ctx->counter_bo); checkGLcall("delete resources"); context_release(context); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f2817eeee04..2b24e071c05 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -142,7 +142,6 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; struct wined3d_buffer *buffer = &buffer_gl->b; struct wined3d_cs *cs = resource->device->cs; @@ -185,10 +184,8 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu } } - GL_EXTCALL(glDeleteBuffers(1, &buffer_gl->bo.id)); - checkGLcall("glDeleteBuffers"); + wined3d_context_gl_destroy_bo(context_gl, &buffer_gl->bo); buffer_gl->b.buffer_object = 0; - buffer_gl->bo.id = 0; if (buffer_gl->b.fence) { diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f2b5e8697b6..3a5718e6308 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2681,6 +2681,18 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } } +void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + TRACE("context_gl %p, bo %p.\n", context_gl, bo); + + TRACE("Destroying GL buffer %u.\n", bo->id); + GL_EXTCALL(glDeleteBuffers(1, &bo->id)); + checkGLcall("buffer object destruction"); + bo->id = 0; +} + static void wined3d_context_gl_set_render_offscreen(struct wined3d_context_gl *context_gl, BOOL offscreen) { if (context_gl->c.render_offscreen == offscreen) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 41e4415f13f..0aef891547a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -751,18 +751,14 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su /* Context activation is done by the caller. */ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, - unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) + unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl) { struct wined3d_bo_gl *bo = &texture->sub_resources[sub_resource_idx].bo; - GL_EXTCALL(glDeleteBuffers(1, &bo->id)); - checkGLcall("glDeleteBuffers"); - - TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", - bo->id, texture, sub_resource_idx); + TRACE("texture %p, sub_resource_idx %u, context_gl %p.\n", texture, sub_resource_idx, context_gl); + wined3d_context_gl_destroy_bo(context_gl, bo); wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); - bo->id = 0; } static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) @@ -781,7 +777,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) && !wined3d_texture_load_location(texture, i, context, map_binding)) ERR("Failed to load location %s.\n", wined3d_debug_location(map_binding)); if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER) - wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)->gl_info); + wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)); } context_release(context); @@ -3223,7 +3219,7 @@ static void wined3d_texture_gl_unload_location(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { if (texture_gl->t.sub_resources[i].bo.id) - wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl->gl_info); + wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl); } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15380f5ac81..fa718501e45 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2256,6 +2256,7 @@ void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *contex void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;

1 0

Andrey Gusev : bcrypt: BCryptCreateHash is no longer a stub.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 111540ebc7d21b12c8feafcbd5d894f1e0daa3bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=111540ebc7d21b12c8feafcb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 30 15:08:38 2020 +0200 bcrypt: BCryptCreateHash is no longer a stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 380d9105e48..1b7881d4910 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -799,7 +799,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL struct hash *hash; NTSTATUS status; - TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, object_len, + TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) {

1 0

Derek Lesho : mf/topoloader: Implement source node to sink node branch resolver.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: d61e9f7535efcedab4e7b2d9e741d44566a7cb42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61e9f7535efcedab4e7b2d9… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 10:59:40 2020 -0500 mf/topoloader: Implement source node to sink node branch resolver. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d61e9f7535efcedab4e7…

1 0

Nikolay Sivov : dwrite/layout: Zero-initialize initial runs and ranges.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: a067d119bdd2f383666ac1e48ffec4f15319eb36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a067d119bdd2f383666ac1e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 30 15:12:44 2020 +0300 dwrite/layout: Zero-initialize initial runs and ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 75 ++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 44 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 964ef6b9190..cedcd914b3f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -171,16 +171,18 @@ struct regular_layout_run { UINT32 glyphcount; /* actual glyph count after shaping, not necessarily the same as reported to Draw() */ }; -struct layout_run { +struct layout_run +{ struct list entry; enum layout_run_kind kind; - union { + union + { struct inline_object_run object; struct regular_layout_run regular; } u; - FLOAT baseline; - FLOAT height; - UINT32 start_position; /* run text position in range [0, layout-text-length) */ + float baseline; + float height; + unsigned int start_position; /* run text position in range [0, layout-text-length) */ }; struct layout_effective_run { @@ -494,22 +496,16 @@ static BOOL is_run_rtl(const struct layout_effective_run *run) return run->run->u.regular.run.bidiLevel & 1; } -static struct layout_run *alloc_layout_run(enum layout_run_kind kind, UINT32 start_position) +static HRESULT alloc_layout_run(enum layout_run_kind kind, unsigned int start_position, + struct layout_run **run) { - struct layout_run *ret; - - ret = heap_alloc(sizeof(*ret)); - if (!ret) return NULL; + if (!(*run = heap_alloc_zero(sizeof(**run)))) + return E_OUTOFMEMORY; - memset(ret, 0, sizeof(*ret)); - ret->kind = kind; - if (kind == LAYOUT_RUN_REGULAR) { - ret->u.regular.sa.script = Script_Unknown; - ret->u.regular.sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; - } - ret->start_position = start_position; + (*run)->kind = kind; + (*run)->start_position = start_position; - return ret; + return S_OK; } static void free_layout_runs(struct dwrite_textlayout *layout) @@ -772,9 +768,8 @@ static HRESULT layout_itemize(struct dwrite_textlayout *layout) if (FAILED(hr)) return hr; - r = alloc_layout_run(LAYOUT_RUN_INLINE, range->h.range.startPosition); - if (!r) - return E_OUTOFMEMORY; + if (FAILED(hr = alloc_layout_run(LAYOUT_RUN_INLINE, range->h.range.startPosition, &r))) + return hr; r->u.object.object = range->object; r->u.object.length = get_clipped_range_length(layout, range); @@ -893,16 +888,14 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) run->run.fontEmSize = range->fontsize * scale; - if (mapped_length < length) { + if (mapped_length < length) + { struct regular_layout_run *nextrun; struct layout_run *nextr; /* keep mapped part for current run, add another run for the rest */ - nextr = alloc_layout_run(LAYOUT_RUN_REGULAR, 0); - if (!nextr) { - hr = E_OUTOFMEMORY; + if (FAILED(hr = alloc_layout_run(LAYOUT_RUN_REGULAR, 0, &nextr))) goto fatal; - } *nextr = *r; nextr->start_position = run->descr.textPosition + mapped_length; @@ -2227,18 +2220,17 @@ static struct layout_range_header *alloc_layout_range(struct dwrite_textlayout * { struct layout_range *range; - range = heap_alloc(sizeof(*range)); + range = heap_alloc_zero(sizeof(*range)); if (!range) return NULL; range->weight = layout->format.weight; range->style = layout->format.style; range->stretch = layout->format.stretch; range->fontsize = layout->format.fontsize; - range->object = NULL; - range->pair_kerning = FALSE; range->fontfamily = heap_strdupW(layout->format.family_name); - if (!range->fontfamily) { + if (!range->fontfamily) + { heap_free(range); return NULL; } @@ -2256,10 +2248,9 @@ static struct layout_range_header *alloc_layout_range(struct dwrite_textlayout * { struct layout_range_bool *range; - range = heap_alloc(sizeof(*range)); + range = heap_alloc_zero(sizeof(*range)); if (!range) return NULL; - range->value = FALSE; h = &range->h; break; } @@ -2268,10 +2259,9 @@ static struct layout_range_header *alloc_layout_range(struct dwrite_textlayout * { struct layout_range_iface *range; - range = heap_alloc(sizeof(*range)); + range = heap_alloc_zero(sizeof(*range)); if (!range) return NULL; - range->iface = NULL; h = &range->h; break; } @@ -2279,12 +2269,9 @@ static struct layout_range_header *alloc_layout_range(struct dwrite_textlayout * { struct layout_range_spacing *range; - range = heap_alloc(sizeof(*range)); + range = heap_alloc_zero(sizeof(*range)); if (!range) return NULL; - range->leading = 0.0f; - range->trailing = 0.0f; - range->min_advance = 0.0f; h = &range->h; break; } @@ -4805,12 +4792,12 @@ static HRESULT WINAPI dwritetextlayout_sink_SetScriptAnalysis(IDWriteTextAnalysi { struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink1(iface); struct layout_run *run; + HRESULT hr; TRACE("[%u,%u) script=%u:%s\n", position, position + length, sa->script, debugstr_sa_script(sa->script)); - run = alloc_layout_run(LAYOUT_RUN_REGULAR, position); - if (!run) - return E_OUTOFMEMORY; + if (FAILED(hr = alloc_layout_run(LAYOUT_RUN_REGULAR, position, &run))) + return hr; run->u.regular.descr.string = &layout->str[position]; run->u.regular.descr.stringLength = length; @@ -4837,6 +4824,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink { struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink1(iface); struct layout_run *cur_run; + HRESULT hr; TRACE("[%u,%u) %u %u\n", position, position + length, explicitLevel, resolvedLevel); @@ -4868,9 +4856,8 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink /* all fully covered runs are processed at this point, reuse existing run for remaining reported bidi range and add another run for the rest of original one */ - run = alloc_layout_run(LAYOUT_RUN_REGULAR, position + length); - if (!run) - return E_OUTOFMEMORY; + if (FAILED(hr = alloc_layout_run(LAYOUT_RUN_REGULAR, position + length, &run))) + return hr; *run = *cur_run; run->u.regular.descr.textPosition = position + length;

1 0

Nikolay Sivov : dwrite/layout: Zero-initialize layout structure.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 03897554c030ba63ba7f4d161a4fb170e3c57be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03897554c030ba63ba7f4d16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 30 15:12:43 2020 +0300 dwrite/layout: Zero-initialize layout structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ab442c453bf..964ef6b9190 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5080,9 +5080,6 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.wrapping = IDWriteTextFormat_GetWordWrapping(format); layout->format.readingdir = IDWriteTextFormat_GetReadingDirection(format); layout->format.flow = IDWriteTextFormat_GetFlowDirection(format); - layout->format.fallback = NULL; - layout->format.spacing.leadingBefore = 0.0f; - layout->format.spacing.fontLineGapUsage = DWRITE_FONT_LINE_GAP_USAGE_DEFAULT; hr = IDWriteTextFormat_GetLineSpacing(format, &layout->format.spacing.method, &layout->format.spacing.height, &layout->format.spacing.baseline); if (FAILED(hr)) @@ -5115,7 +5112,8 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.family_len = len; hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); - if (hr == S_OK) { + if (hr == S_OK) + { IDWriteTextFormat2 *format2; layout->format.vertical_orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); @@ -5129,10 +5127,6 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I IDWriteTextFormat1_Release(format1); } - else { - layout->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; - layout->format.optical_alignment = DWRITE_OPTICAL_ALIGNMENT_NONE; - } hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); if (hr == S_OK) @@ -5157,14 +5151,6 @@ static HRESULT init_textlayout(const struct textlayout_desc *desc, struct dwrite layout->refcount = 1; layout->len = desc->length; layout->recompute = RECOMPUTE_EVERYTHING; - layout->nominal_breakpoints = NULL; - layout->actual_breakpoints = NULL; - layout->cluster_count = 0; - layout->clustermetrics = NULL; - layout->clusters = NULL; - layout->lines = NULL; - layout->lines_size = 0; - layout->minwidth = 0.0f; list_init(&layout->eruns); list_init(&layout->inlineobjects); list_init(&layout->underlines); @@ -5176,14 +5162,8 @@ static HRESULT init_textlayout(const struct textlayout_desc *desc, struct dwrite list_init(&layout->effects); list_init(&layout->spacing); list_init(&layout->typographies); - memset(&layout->format, 0, sizeof(layout->format)); - memset(&layout->metrics, 0, sizeof(layout->metrics)); layout->metrics.layoutWidth = desc->max_width; layout->metrics.layoutHeight = desc->max_height; - layout->measuringmode = DWRITE_MEASURING_MODE_NATURAL; - - layout->ppdip = 0.0f; - memset(&layout->transform, 0, sizeof(layout->transform)); layout->str = heap_strdupnW(desc->string, desc->length); if (desc->length && !layout->str) { @@ -5212,10 +5192,8 @@ static HRESULT init_textlayout(const struct textlayout_desc *desc, struct dwrite goto fail; } - if (desc->is_gdi_compatible) - layout->measuringmode = desc->use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; - else - layout->measuringmode = DWRITE_MEASURING_MODE_NATURAL; + layout->measuringmode = desc->is_gdi_compatible ? (desc->use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : + DWRITE_MEASURING_MODE_GDI_CLASSIC) : DWRITE_MEASURING_MODE_NATURAL; layout->ppdip = desc->ppdip; layout->transform = desc->transform ? *desc->transform : identity; @@ -5234,22 +5212,22 @@ fail: return hr; } -HRESULT create_textlayout(const struct textlayout_desc *desc, IDWriteTextLayout **ret) +HRESULT create_textlayout(const struct textlayout_desc *desc, IDWriteTextLayout **layout) { - struct dwrite_textlayout *layout; + struct dwrite_textlayout *object; HRESULT hr; - *ret = NULL; + *layout = NULL; if (!desc->format || !desc->string) return E_INVALIDARG; - layout = heap_alloc(sizeof(struct dwrite_textlayout)); - if (!layout) return E_OUTOFMEMORY; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; - hr = init_textlayout(desc, layout); + hr = init_textlayout(desc, object); if (hr == S_OK) - *ret = (IDWriteTextLayout *)&layout->IDWriteTextLayout4_iface; + *layout = (IDWriteTextLayout *)&object->IDWriteTextLayout4_iface; return hr; }

1 0

Derek Lesho : mf/topoloader: Unstub IMFTopologyLoader::Load.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 7c9e6a1c96712de4a152c4fb086d00a151e4e59e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9e6a1c96712de4a152c4fb… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:15 2020 +0300 mf/topoloader: Unstub IMFTopologyLoader::Load. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++---- dlls/mf/topology.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5e5c30ec6fc..20e3e8713c6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1735,7 +1735,6 @@ static void test_topology_loader(void) MF_CONNECT_DIRECT, MF_E_INVALIDMEDIATYPE, - LOADER_TODO, }, { @@ -1766,7 +1765,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_CONVERTER, S_OK, - LOADER_EXPECTED_CONVERTER, + LOADER_EXPECTED_CONVERTER | LOADER_TODO, }, { @@ -1794,7 +1793,6 @@ static void test_topology_loader(void) MF_CONNECT_DIRECT, MF_E_INVALIDMEDIATYPE, - LOADER_TODO, }, { @@ -1850,7 +1848,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_DECODER, S_OK, - LOADER_EXPECTED_DECODER, + LOADER_EXPECTED_DECODER | LOADER_TODO, }, }; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e3a4dfd5141..7001a33f088 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2429,11 +2429,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in break; } - /* For now return original topology. */ - *ret_topology = output_topology; - return IMFTopology_CloneFrom(output_topology, input_topology); + return hr; } static const IMFTopoLoaderVtbl topologyloadervtbl =

1 0