February 2023 - Wine-commits

Francois Gouget : winetest: Don't use plain strings as format specifiers.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: b07129bad4b4807b1922f1ef19686e904a6a84d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b07129bad4b4807b1922f1ef19686e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 13 19:35:22 2023 +0100 winetest: Don't use plain strings as format specifiers. When they contain a percent character they would, at best, not be printed correctly, and at worst cause a crash. --- programs/winetest/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 74b596b237b..18fa25db101 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1122,7 +1122,7 @@ run_tests (char *logname, char *outdir) logfile = create_temp_file( tmpname ); logname = tmpname; } - report (R_OUT, logname); + report (R_OUT, "%s", logname); if (logfile == INVALID_HANDLE_VALUE) report (R_FATAL, "Could not open logfile: %u", GetLastError()); @@ -1148,7 +1148,7 @@ run_tests (char *logname, char *outdir) if (!newdir && (!outdir || GetLastError() != ERROR_ALREADY_EXISTS)) report (R_FATAL, "Could not create directory %s (%d)", tempdir, GetLastError()); - report (R_DIR, tempdir); + report (R_DIR, "%s", tempdir); xprintf ("Version 4\n"); xprintf ("Tests from build %s\n", build_id[0] ? build_id : "-" );

1 0

Francois Gouget : winetest: Avoid an infinite loop in vstrfmtmake() when the format is NULL.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: cac02872c6f3d8c286cfdb6201b200a6c5fa24ee URL: https://gitlab.winehq.org/wine/wine/-/commit/cac02872c6f3d8c286cfdb6201b200… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 13 19:17:57 2023 +0100 winetest: Avoid an infinite loop in vstrfmtmake() when the format is NULL. When the format is NULL vsnprintf() always returns -1 so we keep doubling the allocated memory until running out of memory. --- programs/winetest/util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/util.c b/programs/winetest/util.c index a1320005841..bd5b584c3c4 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -56,6 +56,7 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) char *p; int n; + if (!fmt) fmt = ""; p = xalloc(size); while (1) { n = vsnprintf (p, size, fmt, ap);

1 0

Francois Gouget : d3dcompiler/tests: Allow more imprecision in test_trig() for NVIDIA.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: edf88aa9df420e20fb07bf5fa18e7990593d2615 URL: https://gitlab.winehq.org/wine/wine/-/commit/edf88aa9df420e20fb07bf5fa18e79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 5 11:45:45 2023 +0100 d3dcompiler/tests: Allow more imprecision in test_trig() for NVIDIA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54150 --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 4f52002866e..3e6f3614986 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -501,7 +501,7 @@ static void test_trig(void) for (i = 0; i < 640; i += 20) { v = get_readback_vec4(&rb, i, 0); - ok(compare_vec4(v, sinf(i), cosf(i), 0.0f, 0.0f, 8192), + ok(compare_vec4(v, sinf(i), cosf(i), 0.0f, 0.0f, 16384), "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", i, v->x, v->y, v->z, v->w, sinf(i), cos(i), 0.0f, 0.0f); }

1 0

Francois Gouget : crypt32/tests: Fix a typo in a comment.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 98d7826d0e2c9d29eaffd69b77eaf04d08cbda8c URL: https://gitlab.winehq.org/wine/wine/-/commit/98d7826d0e2c9d29eaffd69b77eaf0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 30 05:30:14 2023 +0100 crypt32/tests: Fix a typo in a comment. --- dlls/crypt32/tests/store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 20d10a110f9..8809c5048b4 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -391,7 +391,7 @@ static void testRegStoreSavedCerts(void) cert1 = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); ok (cert1 != NULL, "Create cert context failed at %ld, %lx\n", i, GetLastError()); ret = CertAddCertificateContextToStore(store, cert1, CERT_STORE_ADD_REPLACE_EXISTING, NULL); - /* Addittional skip per Win7, it allows opening HKLM store, but disallows adding certs */ + /* Additional skip per Win7, it allows opening HKLM store, but disallows adding certs */ err = GetLastError(); if (!ret) {

1 0

Francois Gouget : dbghelp: Fix a typo in a comment.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: d9ccc8664c8aef3e50bac6bc2d1dfa404f9c6eb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9ccc8664c8aef3e50bac6bc2d1dfa… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:32:27 2023 +0100 dbghelp: Fix a typo in a comment. --- dlls/dbghelp/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d4aef183677..56a47ab7dac 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2276,7 +2276,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, struct symt_compiland* compiland = NULL; struct location loc; - /* overwrite compiland name from outter context (if any) */ + /* overwrite compiland name from outer context (if any) */ if (objname) compiland = codeview_new_compiland(msc_dbg, objname); /*

1 0

Francois Gouget : kernel32/tests: Fix a typo in a comment.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 2f3d4d8fa1866b12a23664989b81e158237f74b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f3d4d8fa1866b12a23664989b81e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:32:50 2023 +0100 kernel32/tests: Fix a typo in a comment. --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index eb0b5fec772..5d2d971232f 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -87,7 +87,7 @@ static void test_query_dos_deviceA(void) for (;;) { if (!*p) break; ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); - /* Win10+ exposes security device which requires extra priviledges to be queried. So skip it */ + /* Win10+ exposes the security device which requires extra privileges to be queried. So skip it */ ok(ret2 || broken( !strcmp( p, "MSSECFLTSYS" ) && GetLastError() == ERROR_ACCESS_DENIED ), "QueryDosDeviceA failed to return current mapping for %s, last error %lu\n", p, GetLastError()); p += strlen(p) + 1;

1 0

Francois Gouget : spoolss/tests: Fix a typo in a comment.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: ed03f20d60151c567dc2a0636e835a73d25e5f73 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed03f20d60151c567dc2a0636e835a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 17:12:07 2023 +0100 spoolss/tests: Fix a typo in a comment. --- dlls/spoolss/tests/spoolss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/spoolss/tests/spoolss.c b/dlls/spoolss/tests/spoolss.c index ce55cf50220..07af82e56ac 100644 --- a/dlls/spoolss/tests/spoolss.c +++ b/dlls/spoolss/tests/spoolss.c @@ -208,7 +208,7 @@ START_TEST(spoolss) { LPCSTR ptr; - /* The tests fail on Win7 (see comments in load_function() */ + /* The tests fail on Win7 (see comments in load_functions() */ ptr = load_functions(); if (ptr) { win_skip("%s not found\n", ptr);

1 0

Francois Gouget : uiautomationcore: Fix a typo in a FIXME() message.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 511f98280d1ba0ccce63453d4deae67437fff200 URL: https://gitlab.winehq.org/wine/wine/-/commit/511f98280d1ba0ccce63453d4deae6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:33:24 2023 +0100 uiautomationcore: Fix a typo in a FIXME() message. --- dlls/uiautomationcore/uia_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 14f9977a4d6..eb49640a61f 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -147,7 +147,7 @@ int uia_compare_safearrays(SAFEARRAY *sa1, SAFEARRAY *sa2, int prop_type) if (prop_type != UIAutomationType_IntArray) { - FIXME("Array type %#x value comparsion currently unimplemented.\n", prop_type); + FIXME("Array type %#x value comparison currently unimplemented.\n", prop_type); return -1; }

1 0

Francois Gouget : winegstreamer: Fix a typo in a comment.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: a72415ce5df8a9bdd877c50db423875dafa31c3e URL: https://gitlab.winehq.org/wine/wine/-/commit/a72415ce5df8a9bdd877c50db42387… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:33:48 2023 +0100 winegstreamer: Fix a typo in a comment. --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 32ac4a2830d..5bb824f4399 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1411,7 +1411,7 @@ static NTSTATUS wg_parser_connect(void *args) struct wg_parser_stream *stream = parser->streams[i]; gint64 duration; - /* If we receieved a buffer waiting for tags or caps does not make sense anymore. */ + /* If we received a buffer, waiting for tags or caps does not make sense anymore. */ while ((!stream->has_caps || !stream->has_tags) && !parser->error && !stream->has_buffer) pthread_cond_wait(&parser->init_cond, &parser->mutex);

1 0

Francois Gouget : winevulkan: Fix a typo in a comment.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 96c8d383603d508468bd574f58a05a66395e4e80 URL: https://gitlab.winehq.org/wine/wine/-/commit/96c8d383603d508468bd574f58a05a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:34:22 2023 +0100 winevulkan: Fix a typo in a comment. --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 41a70717674..24006a3f5f4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1168,7 +1168,7 @@ class VkVariable(object): parent = self.parent len = prefix - # check if lenght is a member of another struct (for example pAllocateInfo->commandBufferCount) + # check if length is a member of another struct (for example pAllocateInfo->commandBufferCount) i = len_str.find("->") if i != -1: var = parent[parent.index(len_str[0:i])]

1 0