December 2021 - Wine-Commits

Alexandre Julliard : wine_release: Run c2man.pl directly.
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

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 : Import c2man.pl from the Wine tree.
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: tools Branch: master Commit: fcc613fc13c2174e6114d144c7c288d304672a38 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fcc613fc13c2174e6114d14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 20 10:52:46 2021 +0100 Import c2man.pl from the Wine tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- c2man.pl | 2380 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2380 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=fcc613fc13c2174e611…

1 0

Alexandre Julliard : Wine release 7.0-rc2
by Alexandre Julliard Dec. 17, 2021

Dec. 17, 2021

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

Alexandre Julliard : Release 7.0-rc2.
by Alexandre Julliard Dec. 17, 2021

Dec. 17, 2021

Module: wine Branch: master Commit: 2f5f8b4bd4cb5771223d1ee96a55002d18ad01eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f5f8b4bd4cb5771223d1ee9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 22:13:07 2021 +0100 Release 7.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 486 ++++++++++++++++++++------------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 169 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f5f8b4bd4cb5771223d…

1 0

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

Dec. 17, 2021

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

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

Dec. 17, 2021

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

Tag wine-7.0-rc2 : Alexandre Julliard : Release 7.0-rc2
by Alexandre Julliard Dec. 17, 2021

Dec. 17, 2021

Module: wine Branch: refs/tags/wine-7.0-rc2 Tag: 4361b9ac6bb238f1088ee28719bd0b4cbb622416 URL: https://source.winehq.org/git/wine.git/?a=tag;h=4361b9ac6bb238f1088ee28719b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 22:13:07 2021 +0100 Release 7.0-rc2

1 0

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

Dec. 17, 2021

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

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

Dec. 17, 2021

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

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

Dec. 17, 2021

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