wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Piotr Caban : winedump: Dump metafiles in EMF spool files.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 4d649c6232fc53ebfcc1adf3ead93a8401c0cefb URL: https://gitlab.winehq.org/wine/wine/-/commit/4d649c6232fc53ebfcc1adf3ead93a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:36:33 2022 +0200 winedump: Dump metafiles in EMF spool files. --- tools/winedump/emf.c | 2 +- tools/winedump/emfspool.c | 19 ++++++++++++++++++- tools/winedump/winedump.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f27a9903320..9f73fc365e9 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -77,7 +77,7 @@ static unsigned int read_int(const unsigned char *buffer) #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break #define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, (UINT)header->Flags, (UINT)header->Size, (UINT)header->DataSize); break -static unsigned long dump_emfrecord(unsigned long offset) +unsigned long dump_emfrecord(unsigned long offset) { const unsigned char* ptr; unsigned int type, length, i; diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c index a10b3be2788..d65e580b22e 100644 --- a/tools/winedump/emfspool.c +++ b/tools/winedump/emfspool.c @@ -120,7 +120,24 @@ static unsigned long dump_emfspool_record(unsigned long off) break; } - dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); + switch (hdr->ulID) + { + case EMRI_METAFILE: + case EMRI_FORM_METAFILE: + case EMRI_BW_METAFILE: + case EMRI_BW_FORM_METAFILE: + case EMRI_METAFILE_DATA: + { + unsigned long emf_off = off + sizeof(*hdr); + while ((emf_off = dump_emfrecord(emf_off)) && emf_off < off + sizeof(*hdr) + hdr->cjSize); + break; + } + + default: + dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); + break; + } + return off + sizeof(*hdr) + hdr->cjSize; } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 505470436d0..09f4a9301e7 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -248,6 +248,7 @@ void dbg_dump( void ); enum FileSig get_kind_lnk(void); void lnk_dump( void ); enum FileSig get_kind_emf(void); +unsigned long dump_emfrecord(unsigned long offset); void emf_dump( void ); enum FileSig get_kind_emfspool(void); void emfspool_dump(void);

1 0

Piotr Caban : winedump: Don't use static offset in dump_emfrecord.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: d745c8d4a07949b379085f99b68b15580c42168d URL: https://gitlab.winehq.org/wine/wine/-/commit/d745c8d4a07949b379085f99b68b15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:14:44 2022 +0200 winedump: Don't use static offset in dump_emfrecord. --- tools/winedump/emf.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 8c74702ecff..f27a9903320 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -77,15 +77,13 @@ static unsigned int read_int(const unsigned char *buffer) #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break #define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, (UINT)header->Flags, (UINT)header->Size, (UINT)header->DataSize); break -static unsigned offset = 0; - -static int dump_emfrecord(void) +static unsigned long dump_emfrecord(unsigned long offset) { const unsigned char* ptr; unsigned int type, length, i; ptr = PRD(offset, 8); - if (!ptr) return -1; + if (!ptr) return 0; type = read_int(ptr); length = read_int(ptr + 4); @@ -277,7 +275,7 @@ static int dump_emfrecord(void) } if (length<sizeof(*header) || header->Size%4) - return -1; + return 0; length -= sizeof(*header); offset += sizeof(*header); @@ -286,7 +284,7 @@ static int dump_emfrecord(void) { if (i%16 == 0) printf(" "); - if (!(ptr = PRD(offset, 4))) return -1; + if (!(ptr = PRD(offset, 4))) return 0; length -= 4; offset += 4; printf("%08x ", read_int(ptr)); @@ -295,7 +293,7 @@ static int dump_emfrecord(void) } } - return 0; + return offset; } break; @@ -463,7 +461,7 @@ static int dump_emfrecord(void) } if ( (length < 8) || (length % 4) ) - return -1; + return 0; length -= 8; @@ -473,14 +471,14 @@ static int dump_emfrecord(void) { if (i%16 == 0) printf(" "); - if (!(ptr = PRD(offset, 4))) return -1; + if (!(ptr = PRD(offset, 4))) return 0; offset += 4; printf("%08x ", read_int(ptr)); if ( (i % 16 == 12) || (i + 4 == length)) printf("\n"); } - return 0; + return offset; } enum FileSig get_kind_emf(void) @@ -495,6 +493,6 @@ enum FileSig get_kind_emf(void) void emf_dump(void) { - offset = 0; - while (!dump_emfrecord()); + unsigned long offset = 0; + while ((offset = dump_emfrecord(offset))); }

1 0

Piotr Caban : winedump: Fix buffer overflow in debugstr_wn helper.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: cf78df3612d0731f1254d03e381401655b508433 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf78df3612d0731f1254d03e381401… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:12:00 2022 +0200 winedump: Fix buffer overflow in debugstr_wn helper. --- tools/winedump/emf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 48a67141ace..8c74702ecff 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -49,7 +49,7 @@ static const char *debugstr_wn(const WCHAR *wstr, unsigned int n) i = 0; p = buf; *p++ = '\"'; - while (i < n && i < sizeof(buf) - 2 && wstr[i]) + while (i < n && i < sizeof(buf) - 3 && wstr[i]) { if (wstr[i] < 127) *p++ = wstr[i]; else *p++ = '.';

1 0

Piotr Caban : winedump: Add initial EMF spool files support.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: cfbe32d557f5f07a1e6d6796c478e22274002117 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfbe32d557f5f07a1e6d6796c478e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 18:15:25 2022 +0200 winedump: Add initial EMF spool files support. --- tools/winedump/Makefile.in | 1 + tools/winedump/dump.c | 1 + tools/winedump/emfspool.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 4 +- 4 files changed, 163 insertions(+), 1 deletion(-) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 54028024b0d..04dcacf0216 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ dos.c \ dump.c \ emf.c \ + emfspool.c \ font.c \ le.c \ lib.c \ diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index cf52761290b..f2cb601b295 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -255,6 +255,7 @@ dumpers[] = {SIG_MDMP, get_kind_mdmp, mdmp_dump}, {SIG_LNK, get_kind_lnk, lnk_dump}, {SIG_EMF, get_kind_emf, emf_dump}, + {SIG_EMFSPOOL, get_kind_emfspool, emfspool_dump}, {SIG_MF, get_kind_mf, mf_dump}, {SIG_FNT, get_kind_fnt, fnt_dump}, {SIG_TLB, get_kind_tlb, tlb_dump}, diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c new file mode 100644 index 00000000000..a10b3be2788 --- /dev/null +++ b/tools/winedump/emfspool.c @@ -0,0 +1,158 @@ +/* + * Dump an EMF Spool File + * + * Copyright 2022 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 "winedump.h" + +#define EMFSPOOL_VERSION 0x10000 + +typedef enum +{ + EMRI_METAFILE = 1, + EMRI_ENGINE_FONT, + EMRI_DEVMODE, + EMRI_TYPE1_FONT, + EMRI_PRESTARTPAGE, + EMRI_DESIGNVECTOR, + EMRI_SUBSET_FONT, + EMRI_DELTA_FONT, + EMRI_FORM_METAFILE, + EMRI_BW_METAFILE, + EMRI_BW_FORM_METAFILE, + EMRI_METAFILE_DATA, + EMRI_METAFILE_EXT, + EMRI_BW_METAFILE_EXT, + EMRI_ENGINE_FONT_EXT, + EMRI_TYPE1_FONT_EXT, + EMRI_DESIGNVECTOR_EXT, + EMRI_SUBSET_FONT_EXT, + EMRI_DELTA_FONT_EXT, + EMRI_PS_JOB_DATA, + EMRI_EMBED_FONT_EXT, +} record_type; + +typedef struct +{ + unsigned int dwVersion; + unsigned int cjSize; + unsigned int dpszDocName; + unsigned int dpszOutput; +} header; + +typedef struct +{ + unsigned int ulID; + unsigned int cjSize; +} record_hdr; + +static const WCHAR* read_wstr(unsigned long off) +{ + const WCHAR *beg, *end; + + if (!off) + return NULL; + + beg = end = PRD(off, sizeof(WCHAR)); + off += sizeof(WCHAR); + if (!beg) + fatal("can't read Unicode string, corrupted file\n"); + + while (*end) + { + end = PRD(off, sizeof(WCHAR)); + off += sizeof(WCHAR); + if (!end) + fatal("can't read Unicode string, corrupted file\n"); + } + return beg; +} + +#define EMRICASE(x) case x: printf("%-24s %08x\n", #x, hdr->cjSize); break +static unsigned long dump_emfspool_record(unsigned long off) +{ + const record_hdr *hdr; + + hdr = PRD(off, sizeof(*hdr)); + if (!hdr) + return 0; + + switch (hdr->ulID) + { + EMRICASE(EMRI_METAFILE); + EMRICASE(EMRI_ENGINE_FONT); + EMRICASE(EMRI_DEVMODE); + EMRICASE(EMRI_TYPE1_FONT); + EMRICASE(EMRI_PRESTARTPAGE); + EMRICASE(EMRI_DESIGNVECTOR); + EMRICASE(EMRI_SUBSET_FONT); + EMRICASE(EMRI_DELTA_FONT); + EMRICASE(EMRI_FORM_METAFILE); + EMRICASE(EMRI_BW_METAFILE); + EMRICASE(EMRI_BW_FORM_METAFILE); + EMRICASE(EMRI_METAFILE_DATA); + EMRICASE(EMRI_METAFILE_EXT); + EMRICASE(EMRI_BW_METAFILE_EXT); + EMRICASE(EMRI_ENGINE_FONT_EXT); + EMRICASE(EMRI_TYPE1_FONT_EXT); + EMRICASE(EMRI_DESIGNVECTOR_EXT); + EMRICASE(EMRI_SUBSET_FONT_EXT); + EMRICASE(EMRI_DELTA_FONT_EXT); + EMRICASE(EMRI_PS_JOB_DATA); + EMRICASE(EMRI_EMBED_FONT_EXT); + default: + printf("%u %08x\n", hdr->ulID, hdr->cjSize); + break; + } + + dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); + return off + sizeof(*hdr) + hdr->cjSize; +} + +enum FileSig get_kind_emfspool(void) +{ + const header *hdr; + + hdr = PRD(0, sizeof(*hdr)); + if (hdr && hdr->dwVersion == EMFSPOOL_VERSION) + return SIG_EMFSPOOL; + return SIG_UNKNOWN; +} + +void emfspool_dump(void) +{ + const WCHAR *doc_name, *output; + unsigned long off; + const header *hdr; + + hdr = PRD(0, sizeof(*hdr)); + if(!hdr) + return; + doc_name = read_wstr(hdr->dpszDocName); + output = read_wstr(hdr->dpszOutput); + + printf("File Header\n"); + printf(" %-20s %#x\n", "dwVersion:", hdr->dwVersion); + printf(" %-20s %#x\n", "cjSize:", hdr->cjSize); + printf(" %-20s %#x %s\n", "dpszDocName:", hdr->dpszDocName, get_unicode_str(doc_name, -1)); + printf(" %-20s %#x %s\n", "dpszOutput:", hdr->dpszOutput, get_unicode_str(output, -1)); + printf("\n"); + + off = hdr->cjSize; + while ((off = dump_emfspool_record(off))); +} diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 361f44b62b0..505470436d0 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -214,7 +214,7 @@ const char *get_machine_str(int mach); /* file dumping functions */ enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, - SIG_EMF, SIG_MF, SIG_FNT, SIG_TLB, SIG_NLS}; + SIG_EMF, SIG_EMFSPOOL, SIG_MF, SIG_FNT, SIG_TLB, SIG_NLS}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -249,6 +249,8 @@ enum FileSig get_kind_lnk(void); void lnk_dump( void ); enum FileSig get_kind_emf(void); void emf_dump( void ); +enum FileSig get_kind_emfspool(void); +void emfspool_dump(void); enum FileSig get_kind_mf(void); void mf_dump(void); enum FileSig get_kind_pdb(void);

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

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: 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: 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

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

Daniel Lehman : kernelbase: Call NtCancelSynchronousIoFile in CancelSynchronousIo.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: f8dc38f9c216e677a8dc398f8cada86ec5b8f96b URL: https://gitlab.winehq.org/wine/wine/-/commit/f8dc38f9c216e677a8dc398f8cada8… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Apr 18 22:40:41 2022 -0700 kernelbase: Call NtCancelSynchronousIoFile in CancelSynchronousIo. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/kernel32/tests/pipe.c | 8 -------- dlls/kernelbase/file.c | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 55890cc9172..9481835b49b 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -4247,14 +4247,12 @@ static void test_CancelSynchronousIo(void) SetLastError(0xdeadbeef); res = pCancelSynchronousIo((HANDLE)0xdeadbeef); ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "In CancelSynchronousIo failure, expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); res = pCancelSynchronousIo(GetCurrentThread()); ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); - todo_wine ok(GetLastError() == ERROR_NOT_FOUND, "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); @@ -4269,14 +4267,9 @@ static void test_CancelSynchronousIo(void) ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %lu (error %lu)\n", wait, GetLastError()); SetLastError(0xdeadbeef); res = pCancelSynchronousIo(thread); - todo_wine - { ok(res, "CancelSynchronousIo failed with error %ld\n", GetLastError()); ok(GetLastError() == 0xdeadbeef, "In CancelSynchronousIo failure, expected 0xdeadbeef got %ld\n", GetLastError()); - } - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - CancelIoEx(pipe, NULL); wait = WaitForSingleObject(thread, 1000); ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %lx\n", wait); CloseHandle(thread); @@ -4294,7 +4287,6 @@ static void test_CancelSynchronousIo(void) SetLastError(0xdeadbeef); res = pCancelSynchronousIo(thread); ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); - todo_wine ok(GetLastError() == ERROR_NOT_FOUND, "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 5ba7e0be419..3e1fd5aec4e 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2900,9 +2900,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CancelIoEx( HANDLE handle, LPOVERLAPPED overlapped */ BOOL WINAPI DECLSPEC_HOTPATCH CancelSynchronousIo( HANDLE thread ) { - FIXME( "(%p): stub\n", thread ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + IO_STATUS_BLOCK io; + + return set_ntstatus( NtCancelSynchronousIoFile( thread, NULL, &io )); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022