[PATCH 0/1] MR3049: user32: Ignore invalid parameters in DrawTextEx when HDC is invalid
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47089 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3049
From: Fabian Maurer <dark.shadow4(a)web.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47089 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/text.c | 15 +++++++++++++++ dlls/user32/text.c | 23 ++++++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 317fb9a6a29..a9912b36f79 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -519,6 +519,21 @@ static void test_DrawTextCalcRect(void) ok(textheight==0,"Got textheight from DrawTextExW\n"); ok(dtp.uiLengthDrawn==1337, "invalid dtp.uiLengthDrawn = %i\n",dtp.uiLengthDrawn); } + + // When passing invalid DC, other parameters must be ignored + textheight = DrawTextExW((HDC)0xdeadbeef, emptystringW, 100, (LPRECT)0xdeadbeef, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExW\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER,"Got error %lu\n", GetLastError()); + textheight = DrawTextExW((HDC)0xdeadbeef, (LPWSTR)0xdeadbeef, 100, &rect, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExW\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER,"Got error %lu\n", GetLastError()); + + textheight = DrawTextExA((HDC)0xdeadbeef, emptystring, 100, (LPRECT)0xdeadbeef, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExA\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER,"Got error %lu\n", GetLastError()); + textheight = DrawTextExA((HDC)0xdeadbeef, (LPSTR)0xdeadbeef, 100, &rect, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExA\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER,"Got error %lu\n", GetLastError()); } /* More test cases from bug 12226 */ diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 86946e6a53a..b2a367e8f31 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -874,8 +874,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int len, lh, count=i_count; TEXTMETRICW tm; int lmargin = 0, rmargin = 0; - int x = rect->left, y = rect->top; - int width = rect->right - rect->left; + int x, y, width; int max_width = 0; int last_line; int tabwidth /* to keep gcc happy */ = 0; @@ -897,7 +896,16 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (flags & DT_SINGLELINE) flags &= ~DT_WORDBREAK; - GetTextMetricsW(hdc, &tm); + if (!GetTextMetricsW(hdc, &tm)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + x = rect->left; + y = rect->top; + width = rect->right - rect->left; + if (flags & DT_EXTERNALLEADING) lh = tm.tmHeight + tm.tmExternalLeading; else @@ -1086,18 +1094,23 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, DWORD wmax; DWORD amax; UINT cp; + TEXTMETRICA tm; + + if (!GetTextMetricsA(hdc, &tm)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } if (!count) return 0; if (!str && count > 0) return 0; if( !str || ((count == -1) && !(count = strlen(str)))) { int lh; - TEXTMETRICA tm; if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS)) return 0; - GetTextMetricsA(hdc, &tm); if (flags & DT_EXTERNALLEADING) lh = tm.tmHeight + tm.tmExternalLeading; else -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3049
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=133703 Your paranoid android. === w7u_2qxl (32 bit report) === user32: text.c:533: Test failed: Got error 6 0748:text: unhandled exception c0000005 at 77D9312E === w7u_adm (32 bit report) === user32: text.c:533: Test failed: Got error 6 0864:text: unhandled exception c0000005 at 7795312E === w7u_el (32 bit report) === user32: text.c:533: Test failed: Got error 6 0344:text: unhandled exception c0000005 at 7739312E === w8 (32 bit report) === user32: text.c:533: Test failed: Got error 6 0adc:text: unhandled exception c0000005 at 76F4A95F === w8adm (32 bit report) === user32: text.c:533: Test failed: Got error 6 0ad0:text: unhandled exception c0000005 at 776CA95F === w864 (32 bit report) === user32: 0b6c:text: unhandled exception c0000005 at 77A8470C === w1064v1507 (32 bit report) === user32: 0ca0:text: unhandled exception c0000005 at 7738111C === w1064v1809 (32 bit report) === user32: 1dbc:text: unhandled exception c0000005 at 77E9105B === w1064_tsign (32 bit report) === user32: 1e4c:text: unhandled exception c0000005 at 77BB200C === w10pro64 (32 bit report) === user32: 1c9c:text: unhandled exception c0000005 at 77021ECC === w11pro64 (32 bit report) === user32: 1e54:text: unhandled exception c0000005 at 770F8495 === w7pro64 (64 bit report) === user32: text.c:533: Test failed: Got error 6 0ac4:text: unhandled exception c0000005 at 0000000076FDF1EF === w864 (64 bit report) === user32: text.c:533: Test failed: Got error 6 054c:text: unhandled exception c0000005 at 00007FFDCF49071F === w1064v1507 (64 bit report) === user32: text.c:533: Test failed: Got error 6 0e54:text: unhandled exception c0000005 at 00007FFD62533A26 === w1064v1809 (64 bit report) === user32: text.c:533: Test failed: Got error 6 1804:text: unhandled exception c0000005 at 00007FFB7E495D45 === w1064_2qxl (64 bit report) === user32: text.c:533: Test failed: Got error 6 0a04:text: unhandled exception c0000005 at 00007FF8B923EBD7 === w1064_adm (64 bit report) === user32: text.c:533: Test failed: Got error 6 1d94:text: unhandled exception c0000005 at 00007FFFA49BEBD7 === w1064_tsign (64 bit report) === user32: text.c:533: Test failed: Got error 6 1d9c:text: unhandled exception c0000005 at 00007FF8F631EBD7 === w10pro64 (64 bit report) === user32: text.c:533: Test failed: Got error 6 20e8:text: unhandled exception c0000005 at 00007FFF2EE7EB87 === w10pro64_en_AE_u8 (64 bit report) === user32: text.c:533: Test failed: Got error 6 22ac:text: unhandled exception c0000005 at 00007FFA74CC94CC === w10pro64_ar (64 bit report) === user32: text.c:533: Test failed: Got error 6 0640:text: unhandled exception c0000005 at 00007FFA0991EB87 === w10pro64_ja (64 bit report) === user32: text.c:533: Test failed: Got error 6 0c20:text: unhandled exception c0000005 at 00007FF96EADE7B0 === w10pro64_zh_CN (64 bit report) === user32: text.c:533: Test failed: Got error 6 0ca4:text: unhandled exception c0000005 at 00007FF8B574E7B0 === w11pro64_amd (64 bit report) === user32: text.c:533: Test failed: Got error 6 23f4:text: unhandled exception c0000005 at 00007FF99E0EE276
participants (3)
-
Fabian Maurer -
Fabian Maurer (＠DarkShadow44)
-
Marvin