December 2021 - Wine-commits

Alexandre Julliard : c2man: Add support for running on an entire git checkout.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: tools Branch: master Commit: ba6b317c028ad07db085238993166091e7578737 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ba6b317c028ad07db085238… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 20 10:53:53 2021 +0100 c2man: Add support for running on an entire git checkout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- c2man.pl | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/c2man.pl b/c2man.pl index c736c84..0fe9e78 100755 --- a/c2man.pl +++ b/c2man.pl @@ -95,6 +95,12 @@ sub process_comment($); sub process_extra_comment($); +sub basedir_name($) +{ + (my $file = shift) =~ s/^dlls\/([^\/]*)\/.*/$1/; + return $file +} + # Generate the list of exported entries for the dll sub process_spec_file($) { @@ -106,6 +112,7 @@ sub process_spec_file($) my $spec_details = { + FILE => $spec_name, NAME => $basename, DLL_NAME => $dll_name, DLL_EXT => $dll_ext, @@ -229,6 +236,7 @@ sub process_source_file($) my $source_file = shift; my $source_details = { + FILE => $source_file, CONTRIBUTORS => [ ], DEBUG_CHANNEL => "", }; @@ -1080,7 +1088,7 @@ sub output_comment($) # Write out an index file for each .spec processed sub process_index_files() { - foreach my $spec_file (keys %spec_files) + foreach my $spec_file (sort keys %spec_files) { my $spec_details = $spec_files{$spec_file}[0]; if (defined ($spec_details->{DLL_NAME})) @@ -1129,7 +1137,7 @@ sub output_spec($) } $percent_implemented = int($percent_implemented); my $percent_documented = 0; - if ($spec_details->{NUM_DOCS}) + if ($spec_details->{NUM_FUNCS}) { # Treat forwards and data as documented funcs for statistics $percent_documented = $spec_details->{NUM_DOCS} / $spec_details->{NUM_FUNCS} * 100; @@ -1138,15 +1146,16 @@ sub output_spec($) # Make a list of the contributors to this DLL. my @contributors; + my $files = 0; foreach my $source_file (keys %source_files) { my $source_details = $source_files{$source_file}[0]; - for (@{$source_details->{CONTRIBUTORS}}) - { - push (@contributors, $_); - } + next unless basedir_name($source_details->{FILE}) eq basedir_name($spec_details->{FILE}); + $files++; + push @contributors, @{$source_details->{CONTRIBUTORS}}; } + return unless $files > 0; my %saw; @contributors = grep(!$saw{$_}++, @contributors); # remove dups, from perlfaq4 manpage @@ -2317,6 +2326,18 @@ while(defined($_ = shift @ARGV)) } } +unless (@opt_source_file_list) +{ + # assume we are running from a git checkout + foreach my $f (split /\0/, `git ls-files -c -z`) + { + next unless $f =~ /^dlls\//; + next if $f =~ /\/tests\//; + push @opt_spec_file_list, $f if $f =~ /\.spec$/; + push @opt_source_file_list, $f if $f =~ /\.c$/; + } +} + # Remove duplicate include directories my %htmp; @opt_header_file_list = grep(!$htmp{$_}++, @opt_header_file_list);

1 0

Alexandre Julliard : wine_release: Run c2man.pl directly.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: tools Branch: master Commit: 0eed6f3a9b0d5ae7058c2ba37ba84b7addc5e21f URL: https://source.winehq.org/git/tools.git/?a=commit;h=0eed6f3a9b0d5ae7058c2ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 20 10:54:07 2021 +0100 wine_release: Run c2man.pl directly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- wine_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine_release b/wine_release index b6a27bd..1ef8b7e 100755 --- a/wine_release +++ b/wine_release @@ -69,7 +69,7 @@ then groff -man -T html -P -l -k -K utf8 $f | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/$lang/docs/`basename $name .$lang.UTF-8`.template done - make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI + $tools_dir/c2man.pl -Th -Iinclude -o documentation/html && rm -rf ../WineAPI && mv documentation/html ../WineAPI cd .. rm -rf wine-$version

1 0

Alexandre Julliard : Wine release 7.0-rc2
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: website Branch: master Commit: 593809230c5faa7e769affd1ee7c4357dabdbcfb URL: https://source.winehq.org/git/website.git/?a=commit;h=593809230c5faa7e769af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 22:15:13 2021 +0100 Wine release 7.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021121701.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2021121701.xml b/news/en/2021121701.xml new file mode 100644 index 00000000..152adfac --- /dev/null +++ b/news/en/2021121701.xml @@ -0,0 +1,13 @@ +<news> +<date>December 17, 2021</date> +<title>Wine 7.0-rc2 Released</title> +<body> + The Wine development release 7.0-rc2 is now available. + <a href="{$root}/announce/7.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc2.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

Jacek Caban : ntdll: Don't use inline assembly in do_cpuid.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: d0413d833f430a487589283c53f797da2b4f48a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0413d833f430a487589283c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 17 15:57:32 2021 +0100 ntdll: Don't use inline assembly in do_cpuid. Avoids problems on old GCC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51862 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c2f1ee11eca..9f49b9e6f58 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -249,10 +249,36 @@ BOOL xstate_compaction_enabled = FALSE; #define INEI 0x49656e69 /* "ineI" */ #define NTEL 0x6c65746e /* "ntel" */ -static inline void do_cpuid(unsigned int ax, unsigned int cx, unsigned int *p) -{ - __asm__ ("cpuid" : "=a"(p[0]), "=b" (p[1]), "=c"(p[2]), "=d"(p[3]) : "a"(ax), "c"(cx)); -} +extern void do_cpuid( unsigned int ax, unsigned int cx, unsigned int *p ) DECLSPEC_HIDDEN; +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%ecx\n\t" + "movl 20(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ) +#else +__ASM_GLOBAL_FUNC( do_cpuid, + "pushq %rbx\n\t" + "movl %edi,%eax\n\t" + "movl %esi,%ecx\n\t" + "movq %rdx,%r8\n\t" + "cpuid\n\t" + "movl %eax,(%r8)\n\t" + "movl %ebx,4(%r8)\n\t" + "movl %ecx,8(%r8)\n\t" + "movl %edx,12(%r8)\n\t" + "popq %rbx\n\t" + "ret" ) +#endif #ifdef __i386__ extern int have_cpuid(void) DECLSPEC_HIDDEN;

1 0

Eric Pouech : winedump: Support dumping quad word values in enumerations.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: a9c177464f1a3cc2a065072e780b4a23e08ff43f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c177464f1a3cc2a065072e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 15 13:32:05 2021 +0100 winedump: Support dumping quad word values in enumerations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index f0856b2a6a2..3c632ec19e9 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -504,6 +504,7 @@ static void do_field(const unsigned char* start, const unsigned char* end) const char* cstr; const struct p_string* pstr; int leaf_len, value; + struct full_value full_value; while (ptr < end) { @@ -518,18 +519,18 @@ static void do_field(const unsigned char* start, const unsigned char* end) switch (fieldtype->generic.id) { case LF_ENUMERATE_V1: - leaf_len = numeric_leaf(&value, &fieldtype->enumerate_v1.value); + leaf_len = full_numeric_leaf(&full_value, &fieldtype->enumerate_v1.value); pstr = PSTRING(&fieldtype->enumerate_v1.value, leaf_len); - printf("\t\tEnumerate V1: '%s' value:%d\n", - p_string(pstr), value); + printf("\t\tEnumerate V1: '%s' value:%s\n", + p_string(pstr), full_value_string(&full_value)); ptr += 2 + 2 + leaf_len + 1 + pstr->namelen; break; case LF_ENUMERATE_V3: - leaf_len = numeric_leaf(&value, &fieldtype->enumerate_v3.value); + leaf_len = full_numeric_leaf(&full_value, &fieldtype->enumerate_v3.value); cstr = (const char*)&fieldtype->enumerate_v3.value + leaf_len; - printf("\t\tEnumerate V3: '%s' value:%d\n", - cstr, value); + printf("\t\tEnumerate V3: '%s' value:%s\n", + cstr, full_value_string(&full_value)); ptr += 2 + 2 + leaf_len + strlen(cstr) + 1; break;

1 0

Bernhard Übelacker : inetmib1: Fix endianess issue with dwLocalAddr and dwLocalPort.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 9145b551b2ebe17c1e310790db5c09da24a1beb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9145b551b2ebe17c1e310790… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Thu Dec 16 11:27:19 2021 +0100 inetmib1: Fix endianess issue with dwLocalAddr and dwLocalPort. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52224 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 6345573350e..31dc4d5e8e2 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" +#include "winsock2.h" #include "snmp.h" #include "iphlpapi.h" #include "wine/debug.h" @@ -1217,7 +1218,7 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) assert(oid && oid->idLength >= 5); row->dwLocalAddr = oidToIpAddr(oid); - row->dwLocalPort = oid->ids[4]; + row->dwLocalPort = htons(oid->ids[4]); } static int __cdecl compareUdpRow(const void *a, const void *b) @@ -1225,9 +1226,9 @@ static int __cdecl compareUdpRow(const void *a, const void *b) const MIB_UDPROW *key = a, *value = b; int ret; - ret = key->dwLocalAddr - value->dwLocalAddr; + ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); if (ret == 0) - ret = key->dwLocalPort - value->dwLocalPort; + ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); return ret; } @@ -1269,8 +1270,9 @@ static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, udpTable->table[tableIndex - 1].dwLocalAddr); if (ret) { + UINT id = ntohs(udpTable->table[tableIndex - 1].dwLocalPort); oid.idLength = 1; - oid.ids = &udpTable->table[tableIndex - 1].dwLocalPort; + oid.ids = &id; ret = SnmpUtilOidAppend(&pVarBind->name, &oid); } }

1 0

Henri Verbeet : wined3d: Release the allocator lock on error in wined3d_allocator_chunk_vk_map().
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 44cb2ba942fe930eb2a467416da86dacdb5baf41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cb2ba942fe930eb2a46741… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 17 17:42:17 2021 +0100 wined3d: Release the allocator lock on error in wined3d_allocator_chunk_vk_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 06162d0c0e8..fd6d810f0e2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -273,6 +273,7 @@ void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) { ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_allocator_chunk_vk_unlock(chunk_vk); return NULL; }

1 0

Eric Pouech : server/console: Ensure conhost has created the TTY input stream before waiting.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 751a3325a6ac93d11f08088c40b45a9ae05b52de URL: https://source.winehq.org/git/wine.git/?a=commit;h=751a3325a6ac93d11f08088c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 17 17:18:51 2021 +0100 server/console: Ensure conhost has created the TTY input stream before waiting. Some PE executables (like mingw's gdb port) just do something like: - WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), INFINITE) and hang for ever (the read operations are done *after* the wait operation succeeds) (of course, the real wait operation is more complex, but the problematic part boils down to that) This hangs for ever because conhost's main input thread hasn't been started yet. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/server/console.c b/server/console.c index 977c428cf9f..136c14862e3 100644 --- a/server/console.c +++ b/server/console.c @@ -71,13 +71,14 @@ static struct object *console_lookup_name( struct object *obj, struct unicode_st unsigned int attr, struct object *root ); static struct object *console_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); +static int console_add_queue( struct object *obj, struct wait_queue_entry *entry ); static const struct object_ops console_ops = { sizeof(struct console), /* size */ &file_type, /* type */ console_dump, /* dump */ - add_queue, /* add_queue */ + console_add_queue, /* add_queue */ remove_queue, /* remove_queue */ console_signaled, /* signaled */ no_satisfied, /* satisfied */ @@ -129,14 +130,15 @@ struct console_host_ioctl struct console_server { - struct object obj; /* object header */ - struct fd *fd; /* pseudo-fd for ioctls */ - struct console *console; /* attached console */ - struct list queue; /* ioctl queue */ - struct list read_queue; /* blocking read queue */ - int busy; /* flag if server processing an ioctl */ - int term_fd; /* UNIX terminal fd */ - struct termios termios; /* original termios */ + struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ + struct console *console; /* attached console */ + struct list queue; /* ioctl queue */ + struct list read_queue; /* blocking read queue */ + unsigned int busy : 1; /* flag if server processing an ioctl */ + unsigned int once_input : 1; /* flag if input thread has already been requested */ + int term_fd; /* UNIX terminal fd */ + struct termios termios; /* original termios */ }; static void console_server_dump( struct object *obj, int verbose ); @@ -462,6 +464,23 @@ static const struct fd_ops console_connection_fd_ops = static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); +static int queue_host_ioctl( struct console_server *server, unsigned int code, unsigned int output, + struct async *async, struct async_queue *queue ); + +static int console_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct console *console = (struct console*)obj; + assert( obj->ops == &console_ops ); + /* before waiting, ensure conhost's input thread has been started */ + if (console->server && !console->server->once_input) + { + console->server->once_input = 1; + if (console->server->term_fd == -1) + queue_host_ioctl( console->server, IOCTL_CONDRV_PEEK, 0, NULL, NULL ); + } + return add_queue( &console->obj, entry ); +} + static int console_signaled( struct object *obj, struct wait_queue_entry *entry ) { struct console *console = (struct console*)obj; @@ -889,9 +908,10 @@ static struct object *create_console_server( void ) struct console_server *server; if (!(server = alloc_object( &console_server_ops ))) return NULL; - server->console = NULL; - server->busy = 0; - server->term_fd = -1; + server->console = NULL; + server->busy = 0; + server->once_input = 0; + server->term_fd = -1; list_init( &server->queue ); list_init( &server->read_queue ); server->fd = alloc_pseudo_fd( &console_server_fd_ops, &server->obj, FILE_SYNCHRONOUS_IO_NONALERT ); @@ -1315,7 +1335,7 @@ static int console_input_add_queue( struct object *obj, struct wait_queue_entry set_error( STATUS_ACCESS_DENIED ); return 0; } - return add_queue( &current->process->console->obj, entry ); + return console_add_queue( &current->process->console->obj, entry ); } static struct fd *console_input_get_fd( struct object *obj )

1 0

Andrey Gusev : wined3d: Add WINED3DFMT_R11G11B10_FLOAT vertex format.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: b006a4c5acbc5704210a3b2bc55ec4c6dcef31ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b006a4c5acbc5704210a3b2b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 17 18:33:48 2021 +0200 wined3d: Add WINED3DFMT_R11G11B10_FLOAT vertex format. Used by Dark Souls: Remastered. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 5 files changed, 9 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a4729f9d2d3..a1c4be46b7f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -12370,6 +12370,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, @@ -13649,6 +13650,7 @@ static void test_format_support(void) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT}, + {DXGI_FORMAT_R11G11B10_FLOAT}, {DXGI_FORMAT_R16_FLOAT}, }; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 154221e405c..a76e5fa1295 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18549,6 +18549,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, @@ -20623,6 +20624,7 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R11G11B10_FLOAT, D3D_FEATURE_LEVEL_10_0}, {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, }; diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6cc2f0cd9a8..5511a70a8ff 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -159,6 +159,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, + {"GL_ARB_vertex_type_10f_11f_11f_rev", ARB_VERTEX_TYPE_10F_11F_11F_REV}, {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, {"GL_ARB_viewport_array", ARB_VIEWPORT_ARRAY }, {"GL_ARB_texture_barrier", ARB_TEXTURE_BARRIER }, @@ -3385,6 +3386,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, {ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, MAKEDWORD_VERSION(4, 4)}, + {ARB_VERTEX_TYPE_10F_11F_11F_REV, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef2e28b545a..5e375f43a48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -709,6 +709,8 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, GL_SHORT}, {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, GL_UNSIGNED_SHORT}, {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R11G11B10_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_10F_11F_11F_REV, + ARB_VERTEX_TYPE_10F_11F_11F_REV}, {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, GL_UNSIGNED_SHORT}, {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2dbc56ab79d..7b6fa50c5f0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -143,6 +143,7 @@ enum wined3d_gl_extension ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_PROGRAM, ARB_VERTEX_SHADER, + ARB_VERTEX_TYPE_10F_11F_11F_REV, ARB_VERTEX_TYPE_2_10_10_10_REV, ARB_VIEWPORT_ARRAY, ARB_TEXTURE_BARRIER,

1 0

Paul Gofman : ntdll: Don't set socket IO status after queuing async.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 652dc005787c2ddc486010dffac6803e296a8d73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=652dc005787c2ddc486010df… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 16 23:55:38 2021 +0300 ntdll: Don't set socket IO status after queuing async. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 + dlls/ntdll/unix/socket.c | 135 +++++++++++++++++++++++++++-------------------- 2 files changed, 79 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=652dc005787c2ddc4860…

1 0