[PATCH 0/4] MR733: Assorted spelling fixes.
From: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/tests/xhr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index d60a449678b..2b07ee2f188 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -101,7 +101,7 @@ function test_content_types() { if(v < 10 || types === xml_types) ok(xhr.responseXML !== null, "unexpected null responseXML for " + types[i]); else - ok(xhr.responseXML === null, "unexpected non-null responseXML for " + (override ? "overriden " : "") + types[i]); + ok(xhr.responseXML === null, "unexpected non-null responseXML for " + (override ? "overridden " : "") + types[i]); if(("overrideMimeType" in xhr) && !override) { override = true; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/733
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=122231 Your paranoid android. === w7u_adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w7u_adm (32 bit report) === mshtml: htmldoc.c:3084: Test failed: Incorrect error code: -2146697211 htmldoc.c:3089: Test failed: Page address: L"http://test.winehq.org/tests/winehq_snapshot/" htmldoc.c:5871: Test failed: expected OnChanged_1012 htmldoc.c:5872: Test failed: expected Exec_HTTPEQUIV htmldoc.c:5874: Test failed: expected Exec_SETTITLE htmldoc.c:5915: Test failed: expected FireNavigateComplete2 === w10pro64_ja (64 bit report) === mshtml: htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE
From: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 2fca1f229d1..a51f482cc6f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2579,8 +2579,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, break; case S_LOCAL: /* FIXME: don't store global/static variables accessed through registers... we don't support that - * in locals... anyway, global data record should be present as well (so variable will be avaible - * through global defintion, but potentially not updated) + * in locals... anyway, global data record should be present as well (so the variable will be available + * through the global definition, but potentially not updated) */ if (!sym->local_v3.varflags.enreg_global && !sym->local_v3.varflags.enreg_static) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/733
From: Francois Gouget <fgouget(a)free.fr> --- include/wine/mscvpdb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 994165463f3..69dd42f0c09 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1379,7 +1379,7 @@ struct cv_local_varflag unsigned short is_param : 1; unsigned short address_taken : 1; unsigned short from_compiler : 1; /* generated by compiler */ - unsigned short is_aggregate : 1; /* splitted in several variables by compiler */ + unsigned short is_aggregate : 1; /* split in several variables by compiler */ unsigned short from_aggregate : 1; /* marks a temporary from an aggregate */ unsigned short is_aliased : 1; unsigned short from_alias : 1; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/733
From: Francois Gouget <fgouget(a)free.fr> --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 47f602b7de3..58ab581ed25 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2679,7 +2679,7 @@ static void test_DocumentProperties(void) LONG dm_size, ret; DEVMODEA *dm; char empty_str[] = ""; - char non_existing_str[] = "non existing printer"; + char nonexistent_str[] = "nonexistent printer"; if (!default_printer) { @@ -2708,7 +2708,7 @@ static void test_DocumentProperties(void) ret = DocumentPropertiesA(0, hprn, empty_str, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); - ret = DocumentPropertiesA(0, hprn, non_existing_str, dm, dm, DM_OUT_BUFFER); + ret = DocumentPropertiesA(0, hprn, nonexistent_str, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); test_DEVMODEA(dm, dm_size, default_printer); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/733
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/733
This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/733
participants (5)
-
Francois Gouget -
Francois Gouget (＠fgouget)
-
Huw Davies (＠huw)
-
Jacek Caban (＠jacek)
-
Marvin