ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shlwapi: PathCombineW should return NULL on invalid parameters.

This commit is contained in:
Paul Vriens 2006-06-23 15:21:02 +02:00 committed by Alexandre Julliard
parent a880317e23
commit a796b8a3f7
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shlwapi/path.c
View File

@ -163,7 +163,7 @@ LPWSTR WINAPI PathCombineW(LPWSTR lpszDest, LPCWSTR lpszDir, LPCWSTR lpszFile)
TRACE("(%p,%s,%s)\n", lpszDest, debugstr_w(lpszDir), debugstr_w(lpszFile)); TRACE("(%p,%s,%s)\n", lpszDest, debugstr_w(lpszDir), debugstr_w(lpszFile));
if (!lpszDest || (!lpszDir && !lpszFile)) if (!lpszDest || (!lpszDir && !lpszFile))
return lpszDest; /* Invalid parameters */ return NULL; /* Invalid parameters */
if (!lpszFile || !*lpszFile) if (!lpszFile || !*lpszFile)
{ {

35
dlls/shlwapi/tests/path.c
View File

@ -31,6 +31,7 @@
static HMODULE hShlwapi; static HMODULE hShlwapi;
static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD);
static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD);
static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR);
const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923";
const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923";
@ -860,6 +861,37 @@ static void test_PathMatchSpec(void)
ok (PathMatchSpecA(file, spec13) == TRUE, "PathMatchSpec: Spec13 failed\n"); ok (PathMatchSpecA(file, spec13) == TRUE, "PathMatchSpec: Spec13 failed\n");
} }
static void test_PathCombine(void)
{
LPSTR szString, szString2;
LPWSTR wszString, wszString2;
szString2 = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(char));
wszString2 = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
/* NULL test */
szString = PathCombineA(NULL, NULL, NULL);
ok (szString == NULL, "Expected a NULL return\n");
if (pPathCombineW)
{
wszString = pPathCombineW(NULL, NULL, NULL);
ok (wszString == NULL, "Expected a NULL return\n");
}
/* Some NULL */
szString = PathCombineA(szString2, NULL, NULL);
ok (szString == NULL, "Expected a NULL return\n");
if (pPathCombineW)
{
wszString = pPathCombineW(wszString2, NULL, NULL);
ok (wszString == NULL, "Expected a NULL return\n");
}
HeapFree(GetProcessHeap(), 0, szString2);
HeapFree(GetProcessHeap(), 0, wszString2);
}
START_TEST(path) START_TEST(path)
{ {
@ -893,4 +925,7 @@ START_TEST(path)
pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456); pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456);
if (pPathIsValidCharW) test_PathIsValidCharW(); if (pPathIsValidCharW) test_PathIsValidCharW();
} }
pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW");
test_PathCombine();
} }