October 2022 - Wine-commits

Alex Henrie : include: Add TOOLINFO[AW].
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: fc636b7f45b1017dc4f217377cccf4b9743e583a URL: https://gitlab.winehq.org/wine/wine/-/commit/fc636b7f45b1017dc4f217377cccf4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 16 21:52:04 2022 -0600 include: Add TOOLINFO[AW]. Needed to compile Tera Term. --- include/commctrl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 22750a5b9c4..5a9e363a7a7 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1834,6 +1834,8 @@ typedef struct tagTOOLINFOW { } TTTOOLINFOW, *LPTOOLINFOW, *PTOOLINFOW, *LPTTTOOLINFOW; #define TTTOOLINFO WINELIB_NAME_AW(TTTOOLINFO) +#define TOOLINFOA TTTOOLINFOA +#define TOOLINFOW TTTOOLINFOW #define TOOLINFO WINELIB_NAME_AW(TTTOOLINFO) #define PTOOLINFO WINELIB_NAME_AW(PTOOLINFO) #define LPTTTOOLINFO WINELIB_NAME_AW(LPTTTOOLINFO)

1 0

Rémi Bernon : opengl32: Split is_extension_supported helper.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: cf1f02e2898fcb6eeb48409641100e49d1d68504 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf1f02e2898fcb6eeb48409641100e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 10:34:02 2022 +0200 opengl32: Split is_extension_supported helper. --- dlls/opengl32/wgl.c | 53 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 49f1e4700b4..03117847b9a 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -803,57 +803,45 @@ static int compar(const void *elt_a, const void *elt_b) { } /* Check if a GL extension is supported */ -static BOOL is_extension_supported(const char* extension) +static BOOL check_extension_support( const char *extension, const char *available_extensions ) { - enum wgl_handle_type type = get_current_context_type(); const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - const char *gl_ext_string = NULL; size_t len; TRACE("Checking for extension '%s'\n", extension); - if (type == HANDLE_CONTEXT) - { - gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); - if (!gl_ext_string) - { - ERR("No OpenGL extensions found, check if your OpenGL setup is correct!\n"); - return FALSE; - } - } - /* We use the GetProcAddress function from the display driver to retrieve function pointers * for OpenGL and WGL extensions. In case of winex11.drv the OpenGL extension lookup is done * using glXGetProcAddress. This function is quite unreliable in the sense that its specs don't * require the function to return NULL when an extension isn't found. For this reason we check * if the OpenGL extension required for the function we are looking up is supported. */ - while ((len = strcspn(extension, " ")) != 0) + while ((len = strcspn( extension, " " ))) { /* Check if the extension is part of the GL extension string to see if it is supported. */ - if (has_extension(gl_ext_string, extension, len)) - return TRUE; + if (has_extension( available_extensions, extension, len )) return TRUE; /* In general an OpenGL function starts as an ARB/EXT extension and at some stage * it becomes part of the core OpenGL library and can be reached without the ARB/EXT * suffix as well. In the extension table, these functions contain GL_VERSION_major_minor. * Check if we are searching for a core GL function */ - if(strncmp(extension, "GL_VERSION_", 11) == 0) + if (!strncmp( extension, "GL_VERSION_", 11 )) { const GLubyte *gl_version = funcs->gl.p_glGetString(GL_VERSION); const char *version = extension + 11; /* Move past 'GL_VERSION_' */ - if(!gl_version) { - ERR("No OpenGL version found!\n"); + if (!gl_version) + { + ERR( "No OpenGL version found!\n" ); return FALSE; } /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ - if( (gl_version[0] > version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { - return TRUE; - } - WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]); + if ((gl_version[0] > version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2]))) return TRUE; + + WARN( "The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", + version[0], version[2], gl_version[0], gl_version[2] ); } if (extension[len] == ' ') len++; @@ -863,6 +851,25 @@ static BOOL is_extension_supported(const char* extension) return FALSE; } +/* Check if a GL extension is supported */ +static BOOL is_extension_supported( const char *extension ) +{ + enum wgl_handle_type type = get_current_context_type(); + const char *gl_ext_string = NULL; + + if (type == HANDLE_CONTEXT) + { + gl_ext_string = (const char *)glGetString( GL_EXTENSIONS ); + if (!gl_ext_string) + { + ERR( "No OpenGL extensions found, check if your OpenGL setup is correct!\n" ); + return FALSE; + } + } + + return check_extension_support( extension, gl_ext_string ); +} + /*********************************************************************** * wglGetProcAddress (OPENGL32.@) */

1 0

Rémi Bernon : opengl32: Build extension list in is_extension_supported.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 37328dc3ae68dca23081dbcf548bea50813b2a5c URL: https://gitlab.winehq.org/wine/wine/-/commit/37328dc3ae68dca23081dbcf548bea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 10:57:59 2022 +0200 opengl32: Build extension list in is_extension_supported. --- dlls/opengl32/wgl.c | 66 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 03117847b9a..c05f70dea3f 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -772,22 +772,6 @@ const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext, size_t len ) { - if (!list) - { - const char *gl_ext; - unsigned int i; - GLint extensions_count; - - glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); - for (i = 0; i < extensions_count; ++i) - { - gl_ext = (const char *)glGetStringi(GL_EXTENSIONS, i); - if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) - return TRUE; - } - return FALSE; - } - while (list) { while (*list == ' ') list++; @@ -851,23 +835,51 @@ static BOOL check_extension_support( const char *extension, const char *availabl return FALSE; } +static char *build_extension_list(void) +{ + GLint len = 0, capacity, i, extensions_count; + char *extension, *tmp, *available_extensions; + + glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); + capacity = 128 * extensions_count; + + if (!(available_extensions = HeapAlloc( GetProcessHeap(), 0, capacity ))) return NULL; + for (i = 0; i < extensions_count; ++i) + { + extension = (char *)glGetStringi( GL_EXTENSIONS, i ); + capacity = max( capacity, len + strlen( extension ) + 2 ); + if (!(tmp = HeapReAlloc( GetProcessHeap(), 0, available_extensions, capacity ))) break; + available_extensions = tmp; + len += sprintf( available_extensions + len, "%s ", extension ); + } + if (len) available_extensions[len - 1] = 0; + + return available_extensions; +} + +static char *heap_strdup( const char *str ) +{ + int len = strlen( str ) + 1; + char *ret = HeapAlloc( GetProcessHeap(), 0, len ); + memcpy( ret, str, len ); + return ret; +} + /* Check if a GL extension is supported */ static BOOL is_extension_supported( const char *extension ) { enum wgl_handle_type type = get_current_context_type(); - const char *gl_ext_string = NULL; + char *available_extensions = NULL; + BOOL ret = FALSE; - if (type == HANDLE_CONTEXT) - { - gl_ext_string = (const char *)glGetString( GL_EXTENSIONS ); - if (!gl_ext_string) - { - ERR( "No OpenGL extensions found, check if your OpenGL setup is correct!\n" ); - return FALSE; - } - } + if (type == HANDLE_CONTEXT) available_extensions = heap_strdup( (const char *)glGetString( GL_EXTENSIONS ) ); + if (!available_extensions) available_extensions = build_extension_list(); + + if (!available_extensions) ERR( "No OpenGL extensions found, check if your OpenGL setup is correct!\n" ); + else ret = check_extension_support( extension, available_extensions ); - return check_extension_support( extension, gl_ext_string ); + HeapFree( GetProcessHeap(), 0, available_extensions ); + return ret; } /***********************************************************************

1 0

Rémi Bernon : opengl32: Move filter_extensions (et al.) around.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: deb8b7b5e2791cfdf3fab58af2dd0129990683d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/deb8b7b5e2791cfdf3fab58af2dd01… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 11:08:52 2022 +0200 opengl32: Move filter_extensions (et al.) around. --- dlls/opengl32/wgl.c | 301 +++++++++++++++++++++++++--------------------------- 1 file changed, 144 insertions(+), 157 deletions(-)

1 0

Rémi Bernon : opengl32: Use has_extension in filter_extensions_index.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 60f1436e68c5adfc1fb7e90a8b26f399d308697a URL: https://gitlab.winehq.org/wine/wine/-/commit/60f1436e68c5adfc1fb7e90a8b26f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 11:13:27 2022 +0200 opengl32: Use has_extension in filter_extensions_index. --- dlls/opengl32/wgl.c | 54 +++++++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cf9dc4e0207..c7058322b8c 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -762,10 +762,10 @@ static GLubyte *filter_extensions_list( const char *extensions, const char *disa static GLuint *filter_extensions_index( const char *disabled ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - unsigned int i = 0, j, disabled_size; - const char *ext, *end, *gl_ext; - GLuint *disabled_exts, *tmp; + GLuint *disabled_index; GLint extensions_count; + unsigned int i = 0, j; + const char *ext; if (!funcs->ext.p_glGetStringi) { @@ -775,51 +775,27 @@ static GLuint *filter_extensions_index( const char *disabled ) } funcs->gl.p_glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); - disabled_size = 2; - disabled_exts = HeapAlloc( GetProcessHeap(), 0, disabled_size * sizeof(*disabled_exts) ); - if (!disabled_exts) return NULL; + disabled_index = HeapAlloc( GetProcessHeap(), 0, extensions_count * sizeof(*disabled_index) ); + if (!disabled_index) return NULL; TRACE( "GL_EXTENSIONS:\n" ); for (j = 0; j < extensions_count; ++j) { - gl_ext = (const char *)funcs->ext.p_glGetStringi( GL_EXTENSIONS, j ); - ext = disabled; - - for (;;) + ext = (const char *)funcs->ext.p_glGetStringi( GL_EXTENSIONS, j ); + if (!has_extension( disabled, ext, strlen( ext ) )) { - while (*ext == ' ') ext++; - if (!*ext) - { - TRACE( "++ %s\n", gl_ext ); - break; - } - if (!(end = strchr( ext, ' ' ))) end = ext + strlen( ext ); - - if (!strncmp( gl_ext, ext, end - ext ) && !gl_ext[end - ext]) - { - if (i + 1 == disabled_size) - { - disabled_size *= 2; - if (!(tmp = HeapReAlloc( GetProcessHeap(), 0, disabled_exts, disabled_size * sizeof(*disabled_exts) ))) - { - disabled_exts[i] = ~0u; - return disabled_exts; - } - disabled_exts = tmp; - } - - TRACE( "-- %s (disabled by config)\n", gl_ext ); - disabled_exts[i++] = j; - break; - } - - ext = end; + TRACE( "++ %s\n", ext ); + } + else + { + TRACE( "-- %s (disabled by config)\n", ext ); + disabled_index[i++] = j; } } - disabled_exts[i] = ~0u; - return disabled_exts; + disabled_index[i] = ~0u; + return disabled_index; } /* build the extension string by filtering out the disabled extensions */

1 0

David Kahurani : xmllite/writer: Null terminate duplicated strings.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 556b3981b7aab37dcc184ff8c4682f5d079f8be9 URL: https://gitlab.winehq.org/wine/wine/-/commit/556b3981b7aab37dcc184ff8c4682f… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Oct 10 16:01:23 2022 +0300 xmllite/writer: Null terminate duplicated strings. Strings are not being "partially duplicated", but duplicated with explicit length. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/writer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index c4f9ed2f440..065716f7e8c 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -250,7 +250,6 @@ static struct element *pop_element(xmlwriter *writer) static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len) { - size_t size; WCHAR *ret; if (!str) @@ -259,9 +258,12 @@ static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len if (len == -1) len = lstrlenW(str); - size = (len + 1) * sizeof(WCHAR); - ret = writer_alloc(writer, size); - if (ret) memcpy(ret, str, size); + ret = writer_alloc(writer, (len + 1) * sizeof(WCHAR)); + if (ret) + { + memcpy(ret, str, len * sizeof(WCHAR)); + ret[len] = 0; + } return ret; }

1 0

Zebediah Figura : include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 303ce66cef72d33d429dd6a51962fb23567b602a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/303ce66cef72d33d429dd6a51962f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 23 14:55:01 2021 -0600 include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW. The default for MinGW is always ms_printf rather than gnu_printf, but if we are using ucrtbase or ANSI stdio, we want gnu_printf. --- include/private/vkd3d_common.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 9a2de265..78a15c19 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -54,7 +54,11 @@ static inline size_t align(size_t addr, size_t alignment) #ifdef __GNUC__ # define VKD3D_NORETURN __attribute__((noreturn)) -# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args))) +# ifdef __MINGW_PRINTF_FORMAT +# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, args))) +# else +# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args))) +# endif # define VKD3D_UNUSED __attribute__((unused)) # define VKD3D_UNREACHABLE __builtin_unreachable() #else

1 0

Alexandre Julliard : Wine release 7.19
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: website Branch: master Commit: d06c85defe246e8be11c91396b63b801c4a7eaf0 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/d06c85defe246e8be11c91396b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:39:33 2022 +0200 Wine release 7.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022101401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022101401.xml b/news/en/2022101401.xml new file mode 100644 index 00000000..361026e6 --- /dev/null +++ b/news/en/2022101401.xml @@ -0,0 +1,16 @@ +<news> +<date>October 14, 2022</date> +<title>Wine 7.19 Released</title> +<body> + The Wine development release 7.19 is now available. + <a href="{$root}/announce/7.19">What's new</a> in this release: +<ul> + <li>Support for storing DOS attributes on disk.</li> + <li>Bundled vkd3d upgraded to version 1.5.</li> + <li>Support for MPEG-4 audio format.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 7.19.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: e3f00bf7c944f1cde6151fde969f2b49649c3de7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3f00bf7c944f1cde6151fde969f2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:36:58 2022 +0200 Release 7.19. --- ANNOUNCE | 678 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 360 insertions(+), 338 deletions(-)

1 0

Tag wine-7.19 : Alexandre Julliard : Release 7.19
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: refs/tags/wine-7.19 Tag: 304bddfa3a32af2368b11ce12771ea4e68ce8948 URL: https://gitlab.winehq.org/wine/wine/-/tags/304bddfa3a32af2368b11ce12771ea4e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:36:58 2022 +0200 Release 7.19

1 0