April 2024 - Wine-commits - list.winehq.org

Brendan Shanks : win32u: Use PATH_MAX for Unix paths instead of MAX_PATH (from Win32).
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 3992a76ee98c92a274830345b9f2923bb3ca3f94 URL: https://gitlab.winehq.org/wine/wine/-/commit/3992a76ee98c92a274830345b9f292… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 2 15:07:47 2024 -0700 win32u: Use PATH_MAX for Unix paths instead of MAX_PATH (from Win32). --- dlls/win32u/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 701e15c110d..5da70da0f94 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -332,7 +332,7 @@ static char *find_cache_dir(void) { FSRef ref; OSErr err; - static char cached_path[MAX_PATH]; + static char cached_path[PATH_MAX]; static const char *wine = "/Wine", *fonts = "/Fonts"; if(*cached_path) return cached_path; @@ -1439,7 +1439,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) { DIR *dir; struct dirent *dent; - char path[MAX_PATH]; + char path[PATH_MAX]; TRACE("Loading fonts from %s\n", debugstr_a(dirname));

1 0

Brendan Shanks : win32u: Replace sprintf with snprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 996070283c88d14b9967399d1fe511196adcfab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/996070283c88d14b9967399d1fe511… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 1 13:29:40 2024 -0700 win32u: Replace sprintf with snprintf to avoid deprecation warnings on macOS. --- dlls/win32u/defwnd.c | 8 ++-- dlls/win32u/font.c | 10 ++--- dlls/win32u/freetype.c | 4 +- dlls/win32u/input.c | 4 +- dlls/win32u/menu.c | 27 ++++++------ dlls/win32u/spy.c | 6 +-- dlls/win32u/sysparams.c | 106 +++++++++++++++++++++++------------------------ dlls/win32u/winstation.c | 2 +- 8 files changed, 84 insertions(+), 83 deletions(-)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: f19c55867095c0571cf4a99f32036af76fc59edd URL: https://gitlab.winehq.org/wine/wine/-/commit/f19c55867095c0571cf4a99f32036a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 3 22:59:53 2024 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 86b6af3f73a..281318e9ce9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-03-30 00:22+0200\n" +"PO-Revision-Date: 2024-04-03 22:59+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -19381,10 +19381,8 @@ msgid "Help topics: " msgstr "Žinyno temos: " #: programs/wmic/wmic.rc:28 -#, fuzzy -#| msgid "Error: Command line not supported\n" msgid "Error: Command not supported\n" -msgstr "Klaida: Komandos eilutė nepalaikoma\n" +msgstr "Klaida: Komanda nepalaikoma\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n"

1 0

Dmitry Timoshkov : widl: Use generic 'struct sltg_data' for collecting data.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: b83410936ed11b91901c408c4099dbd77965437c URL: https://gitlab.winehq.org/wine/wine/-/commit/b83410936ed11b91901c408c4099db… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 27 14:48:11 2024 +0300 widl: Use generic 'struct sltg_data' for collecting data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 53 +++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 0c8913d2ecc..880bfcfbe5c 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -39,16 +39,10 @@ static const GUID sltg_library_guid = { 0x204ff,0,0,{ 0xc0,0,0,0,0,0,0,0x46 } }; -struct sltg_index +struct sltg_data { int size, allocated; - char *names; -}; - -struct sltg_name_table -{ - int size, allocated; - char *names; + char *data; }; struct sltg_library @@ -74,8 +68,8 @@ struct sltg_block struct sltg_typelib { typelib_t *typelib; - struct sltg_index index; - struct sltg_name_table name_table; + struct sltg_data index; + struct sltg_data name_table; struct sltg_library library; struct sltg_block *blocks; int block_count; @@ -83,7 +77,14 @@ struct sltg_typelib short typeinfo_count; }; -static int add_index(struct sltg_index *index, const char *name) +static void init_sltg_data(struct sltg_data *data) +{ + data->size = 0; + data->allocated = 0; + data->data = NULL; +} + +static int add_index(struct sltg_data *index, const char *name) { int name_offset = index->size; int new_size = index->size + strlen(name) + 1; @@ -91,27 +92,25 @@ static int add_index(struct sltg_index *index, const char *name) if (new_size > index->allocated) { index->allocated = index->allocated ? max(index->allocated * 2, new_size) : new_size; - index->names = xrealloc(index->names, index->allocated); + index->data = xrealloc(index->data, index->allocated); } - strcpy(index->names + index->size, name); + strcpy(index->data + index->size, name); index->size = new_size; return name_offset; } -static void init_index(struct sltg_index *index) +static void init_index(struct sltg_data *index) { static const char compobj[] = { 1,'C','o','m','p','O','b','j',0 }; - index->size = 0; - index->allocated = 0; - index->names = NULL; + init_sltg_data(index); add_index(index, compobj); } -static int add_name(struct sltg_name_table *name_table, const char *name) +static int add_name(struct sltg_data *name_table, const char *name) { int name_offset = name_table->size; int new_size = name_table->size + strlen(name) + 1 + 8; @@ -121,22 +120,20 @@ static int add_name(struct sltg_name_table *name_table, const char *name) if (new_size > name_table->allocated) { name_table->allocated = name_table->allocated ? max(name_table->allocated * 2, new_size) : new_size; - name_table->names = xrealloc(name_table->names, name_table->allocated); + name_table->data = xrealloc(name_table->data, name_table->allocated); } - memset(name_table->names + name_table->size, 0xff, 8); - strcpy(name_table->names + name_table->size + 8, name); + memset(name_table->data + name_table->size, 0xff, 8); + strcpy(name_table->data + name_table->size + 8, name); name_table->size = new_size; - name_table->names[name_table->size - 1] = 0; /* clear alignment */ + name_table->data[name_table->size - 1] = 0; /* clear alignment */ return name_offset; } -static void init_name_table(struct sltg_name_table *name_table) +static void init_name_table(struct sltg_data *name_table) { - name_table->size = 0; - name_table->allocated = 0; - name_table->names = NULL; + init_sltg_data(name_table); } static void init_library(struct sltg_typelib *sltg) @@ -418,7 +415,7 @@ static void sltg_write_header(struct sltg_typelib *sltg, int *library_block_star entry.next = 0; put_data(&entry, sizeof(entry)); - put_data(sltg->index.names, sltg->index.size); + put_data(sltg->index.data, sltg->index.size); memset(pad, 0, 9); put_data(pad, 9); @@ -458,7 +455,7 @@ static void sltg_write_nametable(struct sltg_typelib *typelib) memset(pad, 0xff, 0x200); put_data(pad, 0x200); put_data(&typelib->name_table.size, sizeof(typelib->name_table.size)); - put_data(typelib->name_table.names, typelib->name_table.size); + put_data(typelib->name_table.data, typelib->name_table.size); } static void sltg_write_remainder(void)

1 0

Dmitry Timoshkov : widl: Add more traces.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 5df4c5f06d22ce1a7b9f21674383bfb3a490e5fd URL: https://gitlab.winehq.org/wine/wine/-/commit/5df4c5f06d22ce1a7b9f21674383bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 27 14:49:48 2024 +0300 widl: Add more traces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 880bfcfbe5c..be25fdc5567 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -89,6 +89,8 @@ static int add_index(struct sltg_data *index, const char *name) int name_offset = index->size; int new_size = index->size + strlen(name) + 1; + chat("add_index: name_offset %d, \"%s\"\n", name_offset, name); + if (new_size > index->allocated) { index->allocated = index->allocated ? max(index->allocated * 2, new_size) : new_size; @@ -115,6 +117,8 @@ static int add_name(struct sltg_data *name_table, const char *name) int name_offset = name_table->size; int new_size = name_table->size + strlen(name) + 1 + 8; + chat("add_name: %s\n", name); + new_size = (new_size + 1) & ~1; /* align */ if (new_size > name_table->allocated) @@ -195,6 +199,8 @@ static void init_library(struct sltg_typelib *sltg) static void add_block(struct sltg_typelib *sltg, void *data, int length, const char *name) { + chat("add_block: %p,%d,\"%s\"\n", data, length, name); + sltg->blocks = xrealloc(sltg->blocks, sizeof(sltg->blocks[0]) * (sltg->block_count + 1)); sltg->blocks[sltg->block_count].length = length; sltg->blocks[sltg->block_count].data = data; @@ -404,6 +410,8 @@ static void sltg_write_header(struct sltg_typelib *sltg, int *library_block_star entry.length = sltg->blocks[i].length; entry.index_string = sltg->blocks[i].index_string; entry.next = header.first_blk + i; + chat("sltg_write_header: writing block entry %d: length %#x, index_string %#x, next %#x\n", + i, entry.length, entry.index_string, entry.next); put_data(&entry, sizeof(entry)); } @@ -413,8 +421,11 @@ static void sltg_write_header(struct sltg_typelib *sltg, int *library_block_star 12 /* name table header */ + 0x200 /* name table hash */ + sltg->name_table.size; entry.index_string = sltg->blocks[sltg->block_count - 1].index_string; entry.next = 0; + chat("sltg_write_header: writing library block entry %d: length %#x, index_string %#x, next %#x\n", + i, entry.length, entry.index_string, entry.next); put_data(&entry, sizeof(entry)); + chat("sltg_write_header: writing index: %d bytes\n", sltg->index.size); put_data(sltg->index.data, sltg->index.size); memset(pad, 0, 9); put_data(pad, 9); @@ -427,9 +438,12 @@ static void sltg_write_header(struct sltg_typelib *sltg, int *library_block_star } /* library block */ + chat("library_block_start = %#x\n", (int)output_buffer_pos); *library_block_start = output_buffer_pos; + chat("sltg_write_header: writing library block %d: %d bytes\n", i, sltg->blocks[i].length); put_data(sltg->blocks[sltg->block_count - 1].data, sltg->blocks[sltg->block_count - 1].length); + chat("sltg_write_header: writing pad 0x40 bytes\n"); memset(pad, 0xff, 0x40); put_data(pad, 0x40); } @@ -443,6 +457,8 @@ static void sltg_write_helpstrings(struct sltg_typelib *typelib) { static const char dummy[6]; + chat("sltg_write_helpstrings: writing dummy 6 bytes\n"); + put_data(dummy, sizeof(dummy)); } @@ -451,6 +467,8 @@ static void sltg_write_nametable(struct sltg_typelib *typelib) static const short dummy[6] = { 0xffff,1,2,0xff00,0xffff,0xffff }; char pad[0x200]; + chat("sltg_write_nametable: writing 12+0x200+%d bytes\n", typelib->name_table.size); + put_data(dummy, sizeof(dummy)); memset(pad, 0xff, 0x200); put_data(pad, 0x200); @@ -490,11 +508,13 @@ static void save_all_changes(struct sltg_typelib *typelib) sltg_write_typeinfo(typelib); name_table_offset = (int *)(output_buffer + output_buffer_pos); + chat("name_table_offset = %#x\n", (int)output_buffer_pos); put_data(&library_block_start, sizeof(library_block_start)); sltg_write_helpstrings(typelib); *name_table_offset = output_buffer_pos - library_block_start; + chat("*name_table_offset = %#x\n", *name_table_offset); sltg_write_nametable(typelib); sltg_write_remainder();

1 0

Dmitry Timoshkov : widl: Add support for structures.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: f3ca3044febb3ad22bec8ca4601b97e54aadd825 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3ca3044febb3ad22bec8ca4601b97… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 7 17:38:17 2016 +0800 widl: Add support for structures. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 521 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 517 insertions(+), 4 deletions(-)

1 0

Dmitry Timoshkov : widl: Properly align name table entries.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 9d26c6d75a7c2c43723b7dbc8872273c90de62ba URL: https://gitlab.winehq.org/wine/wine/-/commit/9d26c6d75a7c2c43723b7dbc887227… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 7 19:12:47 2016 +0800 widl: Properly align name table entries. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index c924eff89ed..1ab853fb945 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -192,10 +192,15 @@ static int add_name(struct sltg_data *name_table, const char *name) { int name_offset = name_table->size; int new_size = name_table->size + strlen(name) + 1 + 8; + int aligned_size; chat("add_name: %s\n", name); - new_size = (new_size + 1) & ~1; /* align */ + aligned_size = (new_size + 0x1f) & ~0x1f; + if (aligned_size - new_size < 4) + new_size = aligned_size; + else + new_size = (new_size + 1) & ~1; if (new_size > name_table->allocated) {

1 0

Dmitry Timoshkov : widl: Add support for VT_USERDEFINED to SLTG typelib generator.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 1eeebc319002f97d898dc58fc628842a0545736e URL: https://gitlab.winehq.org/wine/wine/-/commit/1eeebc319002f97d898dc58fc62884… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 13 15:58:50 2016 +0800 widl: Add support for VT_USERDEFINED to SLTG typelib generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 174 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 161 insertions(+), 13 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 1ab853fb945..ac4db609919 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -79,6 +79,12 @@ struct sltg_typelib struct sltg_block *typeinfo; }; +struct sltg_hrefmap +{ + int href_count; + int *href; +}; + #include "pshpack1.h" struct sltg_typeinfo_header { @@ -151,6 +157,30 @@ struct sltg_tail short res32; /* unknown */ short type_bytes; /* bytes used by type descriptions */ }; + +struct sltg_hrefinfo +{ + char magic; /* 0xdf */ + char res01; /* 0x00 */ + char res02[0x42]; /* 0xff... */ + int number; /* this is 8 times the number of refs */ + /* Now we have number bytes (8 for each ref) of SLTG_UnknownRefInfo */ + + short res50;/* 0xffff */ + char res52; /* 0x01 */ + int res53; /* 0x00000000 */ + /* Now we have number/8 SLTG_Names (first WORD is no of bytes in the ascii + * string). Strings look like "*\Rxxxx*#n". If xxxx == ffff then the + * ref refers to the nth type listed in this library (0 based). Else + * the xxxx (which maybe fewer than 4 digits) is the offset into the name + * table to a string "*\G{<guid>}#1.0#0#C:\WINNT\System32\stdole32.tlb#" + * The guid is the typelib guid; the ref again refers to the nth type of + * the imported typelib. + */ + + char resxx; /* 0xdf */ +}; + #include "poppack.h" static void init_sltg_data(struct sltg_data *data) @@ -442,7 +472,8 @@ static const char *add_typeinfo_block(struct sltg_typelib *typelib, const type_t return index_name; } -static void init_typeinfo(struct sltg_typeinfo_header *ti, const type_t *type, int kind) +static void init_typeinfo(struct sltg_typeinfo_header *ti, const type_t *type, short kind, + const struct sltg_hrefmap *hrefmap) { ti->magic = 0x0501; ti->href_offset = -1; @@ -456,6 +487,61 @@ static void init_typeinfo(struct sltg_typeinfo_header *ti, const type_t *type, i ti->misc.unknown2 = 0x02; ti->misc.typekind = kind; ti->res1e = -1; + + if (hrefmap->href_count) + { + char name[64]; + int i, hrefinfo_size; + + hrefinfo_size = sizeof(struct sltg_hrefinfo); + + for (i = 0; i < hrefmap->href_count; i++) + { + sprintf(name, "*\\Rffff*#%x", hrefmap->href[i]); + hrefinfo_size += 8 + 2 + strlen(name); + } + + ti->href_offset = ti->member_offset; + ti->member_offset += hrefinfo_size; + } +} + +static void write_hrefmap(struct sltg_data *data, const struct sltg_hrefmap *hrefmap) +{ + struct sltg_hrefinfo hrefinfo; + char name[64]; + int i; + + if (!hrefmap->href_count) return; + + hrefinfo.magic = 0xdf; + hrefinfo.res01 = 0; + memset(hrefinfo.res02, 0xff, sizeof(hrefinfo.res02)); + hrefinfo.number = hrefmap->href_count * 8; + hrefinfo.res50 = -1; + hrefinfo.res52 = 1; + hrefinfo.res53 = 0; + hrefinfo.resxx = 0xdf; + + append_data(data, &hrefinfo, offsetof(struct sltg_hrefinfo, res50)); + + for (i = 0; i < hrefmap->href_count; i++) + append_data(data, "\xff\xff\xff\xff\xff\xff\xff\xff", 8); + + append_data(data, &hrefinfo.res50, 7); + + for (i = 0; i < hrefmap->href_count; i++) + { + short len; + + sprintf(name, "*\\Rffff*#%x", hrefmap->href[i]); + len = strlen(name); + + append_data(data, &len, sizeof(len)); + append_data(data, name, len); + } + + append_data(data, &hrefinfo.resxx, sizeof(hrefinfo.resxx)); } static void dump_var_desc(const char *data, int size) @@ -521,6 +607,9 @@ static int get_element_size(type_t *type) case VT_VARIANT: return 16; + case VT_USERDEFINED: + return 0; + default: error("get_element_size: unrecognized vt %d\n", vt); break; @@ -529,9 +618,41 @@ static int get_element_size(type_t *type) return 0; } -static short write_var_desc(struct sltg_data *data, type_t *type, short flags, short base_offset, int *size_instance) +static int local_href(struct sltg_hrefmap *hrefmap, int typelib_href) +{ + int i, href = -1; + + for (i = 0; i < hrefmap->href_count; i++) + { + if (hrefmap->href[i] == typelib_href) + { + href = i; + break; + } + } + + if (href == -1) + { + href = hrefmap->href_count; + + if (hrefmap->href) + hrefmap->href = xrealloc(hrefmap->href, sizeof(*hrefmap->href) * (hrefmap->href_count + 1)); + else + hrefmap->href = xmalloc(sizeof(*hrefmap->href)); + + hrefmap->href[hrefmap->href_count] = typelib_href; + hrefmap->href_count++; + } + + chat("typelib href %d mapped to local href %d\n", typelib_href, href); + + return href << 2; +} + +static short write_var_desc(struct sltg_data *data, type_t *type, short flags, short base_offset, + int *size_instance, struct sltg_hrefmap *hrefmap) { - short vt, desc_offset; + short vt, vt_flags, desc_offset; chat("write_var_desc: type %p, type->name %s\n", type, type->name ? type->name : "NULL"); @@ -621,21 +742,40 @@ static short write_var_desc(struct sltg_data *data, type_t *type, short flags, s chat("write_var_desc: vt VT_PTR | 0x0400\n"); vt = VT_PTR | 0x0400; append_data(data, &vt, sizeof(vt)); - write_var_desc(data, ref, 0, base_offset, size_instance); + write_var_desc(data, ref, 0, base_offset, size_instance, hrefmap); } else - write_var_desc(data, ref, 0x0e00, base_offset, size_instance); + write_var_desc(data, ref, 0x0e00, base_offset, size_instance, hrefmap); return desc_offset; } chat("write_var_desc: vt %d, flags %04x\n", vt, flags); + vt_flags = vt | flags; + append_data(data, &vt_flags, sizeof(vt_flags)); + + if (vt == VT_USERDEFINED) + { + short href; + + while (type->typelib_idx < 0 && type_is_alias(type)) + type = type_alias_get_aliasee_type(type); + + chat("write_var_desc: VT_USERDEFINED, type %p, name %s, real type %d, href %d\n", + type, type->name, type_get_type(type), type->typelib_idx); + + if (type->typelib_idx == -1) + error("write_var_desc: trying to ref not added type\n"); + + href = local_href(hrefmap, type->typelib_idx); + chat("write_var_desc: VT_USERDEFINED, local href %d\n", href); + + append_data(data, &href, sizeof(href)); + } + if (size_instance) *size_instance += get_element_size(type); - vt |= flags; - append_data(data, &vt, sizeof(vt)); - return desc_offset; } @@ -673,6 +813,7 @@ static void init_sltg_tail(struct sltg_tail *tail) static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) { struct sltg_data data, *var_data = NULL; + struct sltg_hrefmap hrefmap; const char *index_name; struct sltg_typeinfo_header ti; struct sltg_member_header member; @@ -680,15 +821,17 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) int member_offset, var_count = 0, var_data_size = 0, size_instance = 0; short *type_desc_offset = NULL; - chat("add_structure_typeinfo: %s\n", type->name); + chat("add_structure_typeinfo: type %p, type->name %s\n", type, type->name); + + type->typelib_idx = typelib->block_count; + + hrefmap.href_count = 0; + hrefmap.href = NULL; init_sltg_data(&data); index_name = add_typeinfo_block(typelib, type, TKIND_RECORD); - init_typeinfo(&ti, type, TKIND_RECORD); - append_data(&data, &ti, sizeof(ti)); - if (type_struct_get_fields(type)) { int i = 0; @@ -709,7 +852,7 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) init_sltg_data(&var_data[i]); base_offset = var_data_size + (i + 1) * sizeof(struct sltg_variable); - type_desc_offset[i] = write_var_desc(&var_data[i], var->declspec.type, 0, base_offset, &size_instance); + type_desc_offset[i] = write_var_desc(&var_data[i], var->declspec.type, 0, base_offset, &size_instance, &hrefmap); dump_var_desc(var_data[i].data, var_data[i].size); if (var_data[i].size > sizeof(short)) @@ -718,6 +861,11 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) } } + init_typeinfo(&ti, type, TKIND_RECORD, &hrefmap); + append_data(&data, &ti, sizeof(ti)); + + write_hrefmap(&data, &hrefmap); + member_offset = data.size; member.res00 = 0x0001;

1 0

Zebediah Figura : wined3d: Require GLSL 1.20 support.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 010008f629dd0590978095942ded8851ee3a9e17 URL: https://gitlab.winehq.org/wine/wine/-/commit/010008f629dd0590978095942ded88… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 19:37:41 2024 -0500 wined3d: Require GLSL 1.20 support. --- dlls/wined3d/adapter_gl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 46e580b0ce6..1acf247d7a6 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5308,6 +5308,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, } required_extensions[] = { + {ARB_FRAGMENT_SHADER, "ARB_fragment_shader"}, + {ARB_SHADING_LANGUAGE_100, "ARB_shading_language_100"}, + {ARB_VERTEX_SHADER, "ARB_vertex_shader"}, {EXT_FRAMEBUFFER_OBJECT, "EXT_framebuffer_object"}, }; @@ -5379,6 +5382,14 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, } } + if (gl_info->glsl_version <= MAKEDWORD_VERSION(1, 20)) + { + ERR("GLSL version %s is too low; 1.20 is required.\n", + (const char *)gl_info->gl_ops.gl.p_glGetString(GL_SHADING_LANGUAGE_VERSION_ARB)); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); + return FALSE; + } + gl_info->filling_convention_offset = wined3d_adapter_find_fill_offset(&caps_gl_ctx); wined3d_adapter_gl_init_d3d_info(adapter_gl, wined3d_creation_flags);

1 0

Zebediah Figura : wined3d: Remove the "arb" and "none" shader_backend options.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 87041ba759b9d37470f7b5d64dffd917dc3811c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/87041ba759b9d37470f7b5d64dffd9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 12:53:48 2024 -0500 wined3d: Remove the "arb" and "none" shader_backend options. Do not remove the shader_backend setting entirely; it will eventually be useful for selecting the SPIR-V backend for GL. --- dlls/wined3d/adapter_gl.c | 58 +++--------------------------------------- dlls/wined3d/wined3d_main.c | 16 ------------ dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 3 insertions(+), 73 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1acf247d7a6..2486686640f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1987,58 +1987,6 @@ static enum wined3d_pci_device wined3d_guess_card(enum wined3d_feature_level fea return wined3d_gpu_from_feature_level(card_vendor, feature_level); } -static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const struct wined3d_gl_info *gl_info, - const struct wined3d_shader_backend_ops *shader_backend_ops) -{ - if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_VERTEX_SHADER]) - return &glsl_vertex_pipe; - return &ffp_vertex_pipe; -} - -static const struct wined3d_fragment_pipe_ops *select_fragment_implementation(const struct wined3d_gl_info *gl_info, - const struct wined3d_shader_backend_ops *shader_backend_ops) -{ - if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_FRAGMENT_SHADER]) - return &glsl_fragment_pipe; - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) - return &arbfp_fragment_pipeline; - if (gl_info->supported[ATI_FRAGMENT_SHADER]) - return &atifs_fragment_pipeline; - if (gl_info->supported[NV_REGISTER_COMBINERS] && gl_info->supported[NV_TEXTURE_SHADER2]) - return &nvts_fragment_pipeline; - if (gl_info->supported[NV_REGISTER_COMBINERS]) - return &nvrc_fragment_pipeline; - return &ffp_fragment_pipeline; -} - -static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) -{ - BOOL glsl = wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_AUTO - || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_GLSL; - BOOL arb = wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_AUTO - || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB; - - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && !glsl) - { - ERR_(winediag)("Ignoring the shader backend registry key. " - "GLSL is the only shader backend available on core profile contexts. " - "You need to explicitly set GL version to use legacy contexts.\n"); - glsl = TRUE; - } - - glsl = glsl && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - - if (glsl && gl_info->supported[ARB_VERTEX_SHADER] && gl_info->supported[ARB_FRAGMENT_SHADER]) - return &glsl_shader_backend; - if (arb && gl_info->supported[ARB_VERTEX_PROGRAM] && gl_info->supported[ARB_FRAGMENT_PROGRAM]) - return &arb_program_shader_backend; - if (glsl && (gl_info->supported[ARB_VERTEX_SHADER] || gl_info->supported[ARB_FRAGMENT_SHADER])) - return &glsl_shader_backend; - if (arb && (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM])) - return &arb_program_shader_backend; - return &none_shader_backend; -} - static void parse_extension_string(struct wined3d_gl_info *gl_info, const char *extensions, const struct wined3d_extension_map *map, UINT entry_count) { @@ -3755,9 +3703,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter_gl *adapter_gl, checkGLcall("extension detection"); - adapter->shader_backend = select_shader_backend(gl_info); - adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); - adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + adapter->shader_backend = &glsl_shader_backend; + adapter->vertex_pipe = &glsl_vertex_pipe; + adapter->fragment_pipe = &glsl_fragment_pipe; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2bc54299ce1..458d560c539 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -358,22 +358,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("Using the GLSL shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } - else if (!stricmp(buffer, "arb")) - { - ERR_(winediag)("Using the ARB shader backend.\n"); - wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; - } - else if (!stricmp(buffer, "none")) - { - ERR_(winediag)("Disabling shader backends.\n"); - wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE; - } - } - if (wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB - || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_NONE) - { - ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); - TRACE("Use of GL Shading Language disabled.\n"); } if (!get_config_key_dword(hkey, appkey, env, "VideoPciDeviceID", &tmpvalue)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0663e67d7e..f42d5d7d050 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -466,8 +466,6 @@ enum wined3d_shader_backend { WINED3D_SHADER_BACKEND_AUTO, WINED3D_SHADER_BACKEND_GLSL, - WINED3D_SHADER_BACKEND_ARB, - WINED3D_SHADER_BACKEND_NONE, }; #define WINED3D_CSMT_ENABLE 0x00000001

1 0