Skip to content

W
wine-winehq
Commit c1c6f4ad authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

wininet: Also set last error on NULL first parameter in InternetCreateUrl{A, W}.

parent d10891ea
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 11 deletions
dlls/wininet/internet.c
View file @ c1c6f4ad
...@@ -3663,10 +3663,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags, ...@@ -3663,10 +3663,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags,
TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
if (!lpUrlComponents) if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength)
return FALSE;
if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength)
{ {
INTERNET_SetLastError(ERROR_INVALID_PARAMETER); INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
...@@ -3733,10 +3730,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, ...@@ -3733,10 +3730,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags,
TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
if (!lpUrlComponents) if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength)
return FALSE;
if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength)
{ {
INTERNET_SetLastError(ERROR_INVALID_PARAMETER); INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
......
dlls/wininet/tests/url.c
View file @ c1c6f4ad
...@@ -404,11 +404,11 @@ static void InternetCreateUrlA_test(void) ...@@ -404,11 +404,11 @@ static void InternetCreateUrlA_test(void)
host[] = "host"; host[] = "host";
/* test NULL lpUrlComponents */ /* test NULL lpUrlComponents */
ret = InternetCreateUrlA(NULL, 0, NULL, &len);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = InternetCreateUrlA(NULL, 0, NULL, &len);
ok(!ret, "Expected failure\n"); ok(!ret, "Expected failure\n");
ok(GetLastError() == 0xdeadbeef, ok(GetLastError() == ERROR_INVALID_PARAMETER,
"Expected 0xdeadbeef, got %d\n", GetLastError()); "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
ok(len == -1, "Expected len -1, got %d\n", len); ok(len == -1, "Expected len -1, got %d\n", len);
/* test zero'ed lpUrlComponents */ /* test zero'ed lpUrlComponents */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment