[PATCH] tapi32: Add error checks for lineInitialize
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/tapi32/line.c | 4 ++++ dlls/tapi32/tests/tapi.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a726..a978e8e69321 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1165,6 +1165,10 @@ DWORD WINAPI lineInitialize( { FIXME("(%p, %p, %p, %s, %p): stub.\n", lphLineApp, hInstance, lpfnCallback, debugstr_a(lpszAppName), lpdwNumDevs); + + if (!lphLineApp || !hInstance || !lpfnCallback || !lpdwNumDevs) + return LINERR_INVALPOINTER; + return 0; } diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c index 13772c8c7d49..e6fcc96b1853 100644 --- a/dlls/tapi32/tests/tapi.c +++ b/dlls/tapi32/tests/tapi.c @@ -35,16 +35,16 @@ static void test_lineInitialize(void) HLINEAPP lnApp; ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); ok(!ret, "unexpected return value, got %u.\n", ret); -- 2.21.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=60710 Your paranoid android. === debian10 (build log) === ../../../wine/dlls/tapi32/line.c:1170:16: error: ‘LINERR_INVALPOINTER’ undeclared (first use in this function); did you mean ‘LINEERR_INVALPOINTER’? Task: The win32 build failed === debian10 (build log) === ../../../wine/dlls/tapi32/line.c:1170:16: error: ‘LINERR_INVALPOINTER’ undeclared (first use in this function); did you mean ‘LINEERR_INVALPOINTER’? Task: The wow64 build failed
participants (2)
-
Marvin -
Vijay Kiran Kamuju