June 2021 - Wine-devel - list.winehq.org

[PATCH] gdi32: Quiet a noisy FIXME.
by Zhiyi Zhang 21 Jun '21

21 Jun '21

"fixme:font:get_name_record_codepage encoding 20 not handled, platform 1." always shows up. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 5a22f61cbd3..069ffaabf56 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -344,7 +344,7 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); + WARN( "encoding %u not handled, platform %d.\n", encoding, platform ); break; } break; -- 2.30.2

1 0

[PATCH 1/6] winevulkan: Update to VK spec version 1.2.182.
by Georg Lehmann 21 Jun '21

21 Jun '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9ef863837d1..f758a58c935 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.178" +VK_XML_VERSION = "1.2.182" WINE_VK_VERSION = (1, 2) # Filenames to create. @@ -108,6 +108,7 @@ UNSUPPORTED_EXTENSIONS = [ # Extensions for other platforms "VK_EXT_external_memory_dma_buf", "VK_EXT_image_drm_format_modifier", + "VK_EXT_physical_device_drm", "VK_KHR_external_fence_fd", "VK_KHR_external_memory_fd", "VK_KHR_external_semaphore_fd", @@ -115,6 +116,9 @@ UNSUPPORTED_EXTENSIONS = [ # Extensions which require callback handling "VK_EXT_device_memory_report", + # Extensions which are broken + "VK_HUAWEI_subpass_shading", # https://github.com/KhronosGroup/Vulkan-Docs/issues/1564 + # Deprecated extensions "VK_NV_external_memory_capabilities", "VK_NV_external_memory_win32", -- 2.32.0

1 5

[PATCH 1/3] include: Add MFP_POSITIONTYPE_100NS symbol.
by Nikolay Sivov 21 Jun '21

21 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfuuid/mfplay.c | 4 ++++ include/mfplay.idl | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/mfuuid/mfplay.c b/dlls/mfuuid/mfplay.c index 1d28306fe4f..d73e52607c4 100644 --- a/dlls/mfuuid/mfplay.c +++ b/dlls/mfuuid/mfplay.c @@ -17,5 +17,9 @@ */ #include "evr.h" + +#undef EXTERN_GUID +#define EXTERN_GUID DEFINE_GUID + #include "initguid.h" #include "mfplay.h" diff --git a/include/mfplay.idl b/include/mfplay.idl index 7d4345e69e7..42591439a0b 100644 --- a/include/mfplay.idl +++ b/include/mfplay.idl @@ -197,6 +197,8 @@ cpp_quote("#define MFP_GET_ERROR_EVENT(hdr) __MFP_CAST_EVENT(h cpp_quote("#define MFP_GET_PLAYBACK_ENDED_EVENT(hdr) __MFP_CAST_EVENT(hdr, PLAYBACK_ENDED)") cpp_quote("#define MFP_GET_ACQUIRE_USER_CREDENTIAL_EVENT(hdr) __MFP_CAST_EVENT(hdr, ACQUIRE_USER_CREDENTIAL)") +cpp_quote("EXTERN_GUID(MFP_POSITIONTYPE_100NS, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0);") + [ object, uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd), -- 2.30.2

1 2

[PATCH 1/6] ws2_32/tests: Avoid some more test failures on Vista.
by Zebediah Figura 20 Jun '21

20 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f67bc4efae5..b171e6c03e1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3816,6 +3816,9 @@ static void test_fionread_siocatmark(void) ret = recv(client, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask_todo(client, POLLRDBAND, POLLRDBAND); + check_fionread_siocatmark_todo(client, 2, FALSE); ret = recv(client, buffer, 5, 0); @@ -3831,6 +3834,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + ret = 1; ret = setsockopt(client, SOL_SOCKET, SO_OOBINLINE, (char *)&ret, sizeof(ret)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -3845,6 +3851,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDNORM, POLLRDNORM); + check_fionread_siocatmark(client, 1, TRUE); closesocket(client); -- 2.30.2

2 6

[PATCH] iphlpapi: fix the usage of Linux's unprivileged ICMP sockets
by Damjan Jovanovic 20 Jun '21

20 Jun '21

Linux's unprivileged ICMP sockets are completely broken in Wine, and radically differ from MacOS's. Linux doesn't provide IP headers but reports some of the IP header data in the recvmsg() ancillary data, overwrites icmp_id with its own value (a "port" number you can bind() to but can't getsockname()), and on error MSG_ERRQUEUE reads the offending packet's ICMP instead of the reply's while ancillary data provides some of the reply's ICMP fields. This patch fixes these issues and gets Linux's parody implementation to a largely functional level. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8332 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/iphlpapi/icmp.c | 173 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 168 insertions(+), 5 deletions(-)

1 0

[PATCH 1/6] ws2_32/tests: Avoid some more test failures on Vista.
by Zebediah Figura 20 Jun '21

20 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f67bc4efae5..13a5a8687b0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3816,6 +3816,9 @@ static void test_fionread_siocatmark(void) ret = recv(client, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + check_fionread_siocatmark_todo(client, 2, FALSE); ret = recv(client, buffer, 5, 0); @@ -3831,6 +3834,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + ret = 1; ret = setsockopt(client, SOL_SOCKET, SO_OOBINLINE, (char *)&ret, sizeof(ret)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -3845,6 +3851,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDNORM, POLLRDNORM); + check_fionread_siocatmark(client, 1, TRUE); closesocket(client); -- 2.30.2

2 9

[WineHQ] fr: Add a closing parenthesis.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- templates/fr/home.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[WineHQ] php: Fix the spelling of PHP comments.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/incl.php | 4 ++-- include/utils.php | 2 +- include/wwn.php | 2 +- site.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/incl.php b/include/incl.php index 4a528614..443bde2c 100644 --- a/include/incl.php +++ b/include/incl.php @@ -84,7 +84,7 @@ else $avail = array_map("strtolower", $avail); foreach ($avail as $inLang) { - // check to see if langage is available + // check to see if language is available if (in_array($inLang, $GLOBALS['config']->languages)) { debug("global", "lang from browser: {$inLang}"); @@ -92,7 +92,7 @@ else break; } - // check to see if variation of langage is available + // check to see if variation of language is available if (strlen($inLang) > 2) { $inLangAlt = substr($inLang, 0, 2); diff --git a/include/utils.php b/include/utils.php index 4876bd89..7052f67e 100644 --- a/include/utils.php +++ b/include/utils.php @@ -357,7 +357,7 @@ function array_finder ($array, $filter) return $ret; } -// sort a multi-dimentional array by one of the keys +// sort a multi-dimensional array by one of the keys function array_qsort (&$array, $column=0, $order=SORT_ASC, $first=0, $last= -2) { // $array - the array to be sorted diff --git a/include/wwn.php b/include/wwn.php index d13957ec..9231be81 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -21,7 +21,7 @@ class wwn private $map_array; private $inquote = 0; - // constuctor + // constructor public function __construct () { $this->summary = array(); diff --git a/site.php b/site.php index e108f779..1c4be8ce 100644 --- a/site.php +++ b/site.php @@ -56,7 +56,7 @@ if (isset($_SERVER['PATH_INFO'])) $_SERVER['PHP_SELF'] = str_replace($page_params, '', $_SERVER['PHP_SELF']); $_SERVER['PHP_SELF'] = preg_replace('/\/\/$/', '/', $_SERVER['PHP_SELF']); - // don't contine the loop, this is the end page + // don't continue the loop, this is the end page unset($page_params); break; } -- 2.20.1

1 0

[WineHQ] css: Fix the spelling of a comment.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6dbda392..cf76dcc2 100644 --- a/css/styles.css +++ b/css/styles.css @@ -125,7 +125,7 @@ SPAN.link:active { color: #FF0000; text-decoration: none; } /* blockquote */ blockquote { font-size: inherit; } -/* horizonal rules */ +/* horizontal rules */ HR { border-top: 1px solid #d4d4d4; } /* DIV styles */ @@ -612,4 +612,4 @@ BODY.rtl { margin-left: 10px; } -} \ No newline at end of file +} -- 2.20.1

1 0

[WineHQ] js: Fix the spelling of a comment.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- js/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/utils.js b/js/utils.js index a07fe62d..0aeb0efd 100644 --- a/js/utils.js +++ b/js/utils.js @@ -1,5 +1,5 @@ /* - Misc JavaScipt for WineHQ + Misc JavaScript for WineHQ */ // load the vars passed on the `src` line -- 2.20.1

1 0