wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Francois Gouget : include: Add more string types.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: e2f30dc115deecf36b8b9bdd186e4b75afaea03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f30dc115deecf36b8b9bdd1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 16:33:08 2012 +0200 include: Add more string types. --- include/winnt.h | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5106701..9cb57cf 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -446,6 +446,11 @@ typedef wchar_t WCHAR, *PWCHAR; typedef unsigned short WCHAR, *PWCHAR; #endif +typedef ULONG UCSCHAR; +#define MIN_UCSCHAR (0) +#define MAX_UCSCHAR (0x0010ffff) +#define UCSCHAR_INVALID_CHARACTER (0xffffffff) + /* 'Extended/Wide' numerical types */ #ifndef _ULONGLONG_ # define _ULONGLONG_ @@ -468,20 +473,25 @@ typedef ULONGLONG DECLSPEC_ALIGN(8) DWORDLONG, *PDWORDLONG; #endif /* ANSI string types */ -typedef CHAR *PCH, *LPCH; -typedef const CHAR *PCCH, *LPCCH; +typedef CHAR *PCH, *LPCH, *PNZCH; +typedef const CHAR *PCCH, *LPCCH, *PCNZCH; typedef CHAR *PSTR, *LPSTR, *NPSTR; typedef const CHAR *PCSTR, *LPCSTR; typedef CHAR *PZZSTR; typedef const CHAR *PCZZSTR; /* Unicode string types */ +typedef const WCHAR *PCWCHAR, *LPCUWCHAR, *PCUWCHAR; typedef WCHAR *PWCH, *LPWCH; typedef const WCHAR *PCWCH, *LPCWCH; +typedef WCHAR *PNZWCH, *PUNZWCH; +typedef const WCHAR *PCNZWCH, *PCUNZWCH; typedef WCHAR *PWSTR, *LPWSTR, *NWPSTR; typedef const WCHAR *PCWSTR, *LPCWSTR; -typedef WCHAR *PZZWSTR; -typedef const WCHAR *PCZZWSTR; +typedef WCHAR *PZZWSTR, *PUZZWSTR; +typedef const WCHAR *PCZZWSTR, *PCUZZWSTR; +typedef PWSTR *PZPWSTR; +typedef PCWSTR *PZPCWSTR; /* Neutral character and string types */ /* These are only defined for Winelib, i.e. _not_ defined for @@ -494,22 +504,42 @@ typedef const WCHAR *PCZZWSTR; typedef WCHAR TCHAR, *PTCHAR; # define _TCHAR_DEFINED #endif +typedef LPWCH PTCH, LPTCH; +typedef LPCWCH PCTCH, LPCTCH; typedef LPWSTR PTSTR, LPTSTR; typedef LPCWSTR PCTSTR, LPCTSTR; -typedef PZZSTR PZZTSTR; -typedef PCZZSTR PCZZTSTR; +typedef LPWSTR PUTSTR, LPUTSTR; +typedef LPCWSTR PCUTSTR, LPCUTSTR; +typedef PNZWCH PNZTCH; +typedef PUNZWCH PUNZTCH; +typedef PCNZWCH PCNZTCH; +typedef PCUNZWCH PCUNZTCH; +typedef PZZWSTR PZZTSTR; +typedef PCZZWSTR PCZZTSTR; +typedef PUZZWSTR PUZZTSTR; +typedef PUCZZWSTR PCUZZTSTR; # else /* UNICODE */ # ifndef _TCHAR_DEFINED typedef CHAR TCHAR, *PTCHAR; # define _TCHAR_DEFINED # endif +typedef LPCH PTCH, LPTCH; +typedef LPCCH PCTCH, LPCTCH; typedef LPSTR PTSTR, LPTSTR; typedef LPCSTR PCTSTR, LPCTSTR; -typedef PZZWSTR PZZTSTR; -typedef PCZZWSTR PCZZTSTR; +typedef PNZCH PNZTCH, PUNZTCH; +typedef PCNZCH PCNZTCH, PCUNZTCH; +typedef PZZSTR PZZTSTR, PUZZTSTR; +typedef PCZZSTR PCZZTSTR, PCUZZTSTR; # endif /* UNICODE */ #endif /* WINE_NO_UNICODE_MACROS */ +/* UCS string types */ +typedef UCSCHAR *PUCSCHAR, *PUUCSCHAR; +typedef const UCSCHAR *PCUCSCHAR, *PCUUCSCHAR; +typedef UCSCHAR *PUCSSTR, *PUUCSSTR; +typedef const UCSCHAR *PCUCSSTR, *PCUUCSSTR; + /* Misc common WIN32 types */ typedef char CCHAR; typedef DWORD LCID, *PLCID;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 5f55a71b705c760441c19f47041d0ad00ed0fe35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f55a71b705c760441c19f470… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 16:30:19 2012 +0200 Assorted spelling fixes. --- dlls/gdi32/freetype.c | 2 +- dlls/iphlpapi/ipstats.c | 8 ++++---- dlls/kernel32/tests/sync.c | 2 +- dlls/shell32/shlexec.c | 2 +- dlls/shlwapi/tests/url.c | 6 +++--- dlls/wininet/urlcache.c | 2 +- programs/cmd/tests/test_builtins.cmd | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3a90036..b02fb69 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6563,7 +6563,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (!style_nameW) { - FIXME("failed to read sytle_nameW for font %s!\n", wine_dbgstr_w(font->name)); + FIXME("failed to read style_nameW for font %s!\n", wine_dbgstr_w(font->name)); lensty = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0) * sizeof(WCHAR); style_nameW = HeapAlloc(GetProcessHeap(), 0, lensty); MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, style_nameW, lensty/sizeof(WCHAR)); diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index a56e753..a78424b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -558,7 +558,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) * * PARAMS * stats [Out] buffer for ICMP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -731,7 +731,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) * * PARAMS * stats [Out] buffer for IP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -981,7 +981,7 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) * * PARAMS * stats [Out] buffer for TCP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -1143,7 +1143,7 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) * * PARAMS * stats [Out] buffer for UDP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 02c023a..7fdb633 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1338,7 +1338,7 @@ static void test_condvars(void) ok(totalconsumed == totalproduced, "consumed %d != produced %d\n", totalconsumed, totalproduced); - ok (!condvar_sleeperr, "error occured during SleepConditionVariableCS\n"); + ok (!condvar_sleeperr, "error occurred during SleepConditionVariableCS\n"); /* Checking cnt1 - cnt2 for non-0 would be not good, the case where * one consumer does not get anything to do is possible. */ diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a1599e4..de6c0f9 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1911,7 +1911,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3)) { - /* if so, append lpFile http:// and call ShellExecute */ + /* if so, prefix lpFile with http:// and call ShellExecute */ WCHAR lpstrTmpFile[256]; strcpyW(lpstrTmpFile, wHttp); strcatW(lpstrTmpFile, lpFile); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 02dcb1c..ee3adf6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1288,7 +1288,7 @@ static void test_UrlUnescape(void) ok(strcmp(szReturnUrl,TEST_URL_UNESCAPE[i].expect)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url); ZeroMemory(szReturnUrl, sizeof(szReturnUrl)); - /* if we set the bufferpointer to NULL here UrlUnescape fails and string gets not converted */ + /* if we set the buffer pointer to NULL here, UrlUnescape fails and the string is not converted */ res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); ok(res == E_INVALIDARG, "UrlUnescapeA returned 0x%x (expected E_INVALIDARG) for \"%s\"\n", @@ -1319,7 +1319,7 @@ static void test_UrlUnescape(void) ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ res = pUrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); @@ -1330,7 +1330,7 @@ static void test_UrlUnescape(void) ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ res = pUrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index fa0c96f..45f447f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2384,7 +2384,7 @@ static DWORD urlcache_rate_entry(URL_CACHEFILE_ENTRY *url_entry, FILETIME *cur_t time.u.LowPart = cur_time->dwLowDateTime; time.u.HighPart = cur_time->dwHighDateTime; - /* Don't touch entries that were added less then 10 minutes ago */ + /* Don't touch entries that were added less than 10 minutes ago */ if(time.QuadPart < access_time.QuadPart + (ULONGLONG)10*60*FILETIME_SECOND) return -1; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 77086ed..42507ce 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -644,7 +644,7 @@ echo --- basic wildcards for %%i in (ba*) do echo %%i echo --- for /d for /d %%i in (baz foo bar) do echo %%i 2>&1 -rem Confirm we dont match files: +rem Confirm we don't match files: for /d %%i in (bazb*) do echo %%i 2>&1 for /d %%i in (bazb2*) do echo %%i 2>&1 rem Show we pass through non wildcards

1 0

Piotr Caban : wininet: Added support for cache containers without subdirectories.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: d07d3cbe9144ced802430c610d7f58090f666c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07d3cbe9144ced802430c610… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 24 14:57:55 2012 +0200 wininet: Added support for cache containers without subdirectories. --- dlls/wininet/urlcache.c | 81 +++++++++++++++++++++++++++++++--------------- 1 files changed, 54 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index cbfa04f..fa0c96f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -81,6 +81,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_FLAG_BITS 6 #define PENDING_DELETE_CACHE_ENTRY 0x00400000 +#define CACHE_CONTAINER_NO_SUBDIR 0xFE #define CACHE_HEADER_DATA_ROOT_LEAK_OFFSET 0x16 @@ -340,7 +341,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer, DWORD b /* 127MB - taken from default for Windows 2000 */ pHeader->CacheLimit.QuadPart = 0x07ff5400; /* Copied from a Windows 2000 cache index */ - pHeader->DirectoryCount = 4; + pHeader->DirectoryCount = pContainer->default_entry_type==NORMAL_CACHE_ENTRY ? 4 : 0; /* If the registry has a cache size set, use the registry value */ if (RegOpenKeyA(HKEY_CURRENT_USER, szCacheContent, &key) == ERROR_SUCCESS) @@ -901,21 +902,31 @@ static BOOL URLCache_LocalFileNameToPathW( LONG nRequired; int path_len = strlenW(pContainer->path); int file_name_len = MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, NULL, 0); - if (Directory >= pHeader->DirectoryCount) + if (Directory!=CACHE_CONTAINER_NO_SUBDIR && Directory>=pHeader->DirectoryCount) { *lpBufferSize = 0; return FALSE; } - nRequired = (path_len + DIR_LENGTH + file_name_len + 1) * sizeof(WCHAR); + nRequired = (path_len + file_name_len) * sizeof(WCHAR); + if(Directory != CACHE_CONTAINER_NO_SUBDIR) + nRequired += (DIR_LENGTH + 1) * sizeof(WCHAR); if (nRequired <= *lpBufferSize) { int dir_len; memcpy(wszPath, pContainer->path, path_len * sizeof(WCHAR)); - dir_len = MultiByteToWideChar(CP_ACP, 0, pHeader->directory_data[Directory].filename, DIR_LENGTH, wszPath + path_len, DIR_LENGTH); - wszPath[dir_len + path_len] = '\\'; - MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len + 1, file_name_len); + if (Directory != CACHE_CONTAINER_NO_SUBDIR) + { + dir_len = MultiByteToWideChar(CP_ACP, 0, pHeader->directory_data[Directory].filename, DIR_LENGTH, wszPath + path_len, DIR_LENGTH); + wszPath[dir_len + path_len] = '\\'; + dir_len++; + } + else + { + dir_len = 0; + } + MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len, file_name_len); *lpBufferSize = nRequired; return TRUE; } @@ -946,7 +957,7 @@ static BOOL URLCache_LocalFileNameToPathA( LONG nRequired; int path_len, file_name_len, dir_len; - if (Directory >= pHeader->DirectoryCount) + if (Directory!=CACHE_CONTAINER_NO_SUBDIR && Directory>=pHeader->DirectoryCount) { *lpBufferSize = 0; return FALSE; @@ -954,15 +965,20 @@ static BOOL URLCache_LocalFileNameToPathA( path_len = WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, NULL, 0, NULL, NULL) - 1; file_name_len = strlen(szLocalFileName) + 1 /* for nul-terminator */; - dir_len = DIR_LENGTH; + if (Directory!=CACHE_CONTAINER_NO_SUBDIR) + dir_len = DIR_LENGTH+1; + else + dir_len = 0; - nRequired = (path_len + dir_len + 1 + file_name_len) * sizeof(char); + nRequired = (path_len + dir_len + file_name_len) * sizeof(char); if (nRequired < *lpBufferSize) { WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, szPath, path_len, NULL, NULL); - memcpy(szPath+path_len, pHeader->directory_data[Directory].filename, dir_len); - szPath[path_len + dir_len] = '\\'; - memcpy(szPath + path_len + dir_len + 1, szLocalFileName, file_name_len); + if(dir_len) { + memcpy(szPath+path_len, pHeader->directory_data[Directory].filename, dir_len-1); + szPath[path_len + dir_len-1] = '\\'; + } + memcpy(szPath + path_len + dir_len, szLocalFileName, file_name_len); *lpBufferSize = nRequired; return TRUE; } @@ -2885,7 +2901,10 @@ BOOL WINAPI CreateUrlCacheEntryW( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - CacheDir = (BYTE)(rand() % pHeader->DirectoryCount); + if(pHeader->DirectoryCount) + CacheDir = (BYTE)(rand() % pHeader->DirectoryCount); + else + CacheDir = CACHE_CONTAINER_NO_SUBDIR; lBufferSize = MAX_PATH * sizeof(WCHAR); if (!URLCache_LocalFileNameToPathW(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize)) @@ -3001,7 +3020,7 @@ static BOOL CommitUrlCacheEntryInternal( DWORD dwOffsetFileExtension = 0; WIN32_FILE_ATTRIBUTE_DATA file_attr; LARGE_INTEGER file_size; - BYTE cDirectory = 0; + BYTE cDirectory; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; LPSTR lpszFileExtensionA = NULL; @@ -3081,6 +3100,11 @@ static BOOL CommitUrlCacheEntryInternal( DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); } + if (pHeader->DirectoryCount) + cDirectory = 0; + else + cDirectory = CACHE_CONTAINER_NO_SUBDIR; + if (lpszLocalFileName) { BOOL bFound = FALSE; @@ -3098,24 +3122,27 @@ static BOOL CommitUrlCacheEntryInternal( WideCharToMultiByte(CP_ACP, 0, lpszLocalFileName, -1, achFile, MAX_PATH, NULL, NULL); pchLocalFileName = achFile; - for (cDirectory = 0; cDirectory < pHeader->DirectoryCount; cDirectory++) + if(pHeader->DirectoryCount) { - if (!strncmp(pHeader->directory_data[cDirectory].filename, pchLocalFileName, DIR_LENGTH)) + for (cDirectory = 0; cDirectory < pHeader->DirectoryCount; cDirectory++) { - bFound = TRUE; - break; + if (!strncmp(pHeader->directory_data[cDirectory].filename, pchLocalFileName, DIR_LENGTH)) + { + bFound = TRUE; + break; + } } - } - if (!bFound) - { - ERR("cache directory not found in path %s\n", debugstr_w(lpszLocalFileName)); - error = ERROR_INVALID_PARAMETER; - goto cleanup; - } + if (!bFound) + { + ERR("cache directory not found in path %s\n", debugstr_w(lpszLocalFileName)); + error = ERROR_INVALID_PARAMETER; + goto cleanup; + } - lpszLocalFileName += DIR_LENGTH + 1; - pchLocalFileName += DIR_LENGTH + 1; + lpszLocalFileName += DIR_LENGTH + 1; + pchLocalFileName += DIR_LENGTH + 1; + } } dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(lpszUrlNameA) + 1);

1 0

Piotr Caban : wininet: Added support for cache path parameter in FreeUrlCacheSpace function.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 78835843c2ced74e7317a3662d21f5b25db20276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78835843c2ced74e7317a3662… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 24 14:57:21 2012 +0200 wininet: Added support for cache path parameter in FreeUrlCacheSpace function. --- dlls/wininet/urlcache.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 5a4ed0b..cbfa04f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2413,7 +2413,7 @@ static int dword_cmp(const void *p1, const void *p2) BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) { URLCACHECONTAINER *container; - DWORD err; + DWORD path_len, err; TRACE("(%s, %x, %x)\n", debugstr_w(cache_path), size, filter); @@ -2423,16 +2423,20 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) } if(cache_path) { - FIXME("cache_path != NULL not supported yet\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + path_len = strlenW(cache_path); + if(cache_path[path_len-1] == '\\') + path_len--; + }else { + path_len = 0; } if(size==100 && !filter) { LIST_FOR_EACH_ENTRY(container, &UrlContainers, URLCACHECONTAINER, entry) { - /* The URL cache has prefix L"" (unlike Cookies and History) */ - if (container->cache_prefix[0] == 0) + /* When cache_path==NULL only clean Temporary Internet Files */ + if((!path_len && container->cache_prefix[0]==0) || + (path_len && !strncmpiW(container->path, cache_path, path_len) && + (container->path[path_len]=='\0' || container->path[path_len]=='\\'))) { BOOL ret_del; @@ -2444,9 +2448,12 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) err = URLCacheContainer_OpenIndex(container, MIN_BLOCK_NO); ReleaseMutex(container->hMutex); - return ret_del && (err == ERROR_SUCCESS); + if(!ret_del || (err != ERROR_SUCCESS)) + return FALSE; } } + + return TRUE; } LIST_FOR_EACH_ENTRY(container, &UrlContainers, URLCACHECONTAINER, entry) @@ -2460,6 +2467,11 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) DWORD rate[100], rate_no; FILETIME cur_time; + if((path_len || container->cache_prefix[0]!=0) && + (!path_len || strncmpiW(container->path, cache_path, path_len) || + (container->path[path_len]!='\0' && container->path[path_len]!='\\'))) + continue; + err = URLCacheContainer_OpenIndex(container, MIN_BLOCK_NO); if(err != ERROR_SUCCESS) continue; @@ -2555,12 +2567,12 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) * * See FreeUrlCacheSpaceW. */ -BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwSizeType) +BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwFilter) { BOOL ret = FALSE; LPWSTR path = heap_strdupAtoW(lpszCachePath); if (lpszCachePath == NULL || path != NULL) - ret = FreeUrlCacheSpaceW(path, dwSize, dwSizeType); + ret = FreeUrlCacheSpaceW(path, dwSize, dwFilter); heap_free(path); return ret; }

1 0

Piotr Caban : wininet: Added tests for entries with identical hash key.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 71511c9fc55a32b43aaebcb4f29d77d08d24b072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71511c9fc55a32b43aaebcb4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 24 14:56:56 2012 +0200 wininet: Added tests for entries with identical hash key. --- dlls/wininet/tests/urlcache.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 4118220..c2e355a 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -31,6 +31,8 @@ #define TEST_URL "http://urlcachetest.winehq.org/index.html" #define TEST_URL1 "Visited: user@http://urlcachetest.winehq.org/index.html" +#define TEST_HASH_COLLISIONS1 "Visited: http://winehq.org/doc0.html" +#define TEST_HASH_COLLISIONS2 "Visited: http://winehq.org/doc75651909.html" static BOOL (WINAPI *pDeleteUrlCacheEntryA)(LPCSTR); static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD); @@ -751,6 +753,43 @@ static void test_urlcacheA(void) ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); check_file_not_exists(filenameA); } + + /* Test if files with identical hash keys are handled correctly */ + ret = CommitUrlCacheEntryA(TEST_HASH_COLLISIONS1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + ret = CommitUrlCacheEntryA(TEST_HASH_COLLISIONS2, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + cbCacheEntryInfo = 0; + ret = GetUrlCacheEntryInfo(TEST_HASH_COLLISIONS1, NULL, &cbCacheEntryInfo); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_HASH_COLLISIONS1, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_HASH_COLLISIONS1), + "got incorrect entry: %s\n", lpCacheEntryInfo->lpszSourceUrlName); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + cbCacheEntryInfo = 0; + ret = GetUrlCacheEntryInfo(TEST_HASH_COLLISIONS2, NULL, &cbCacheEntryInfo); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_HASH_COLLISIONS2, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_HASH_COLLISIONS2), + "got incorrect entry: %s\n", lpCacheEntryInfo->lpszSourceUrlName); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + if (pDeleteUrlCacheEntryA) { + ret = pDeleteUrlCacheEntryA(TEST_HASH_COLLISIONS1); + ok(ret, "DeleteUrlCacheEntry failed: %d\n", GetLastError()); + ret = pDeleteUrlCacheEntryA(TEST_HASH_COLLISIONS2); + ok(ret, "DeleteUrlCacheEntry failed: %d\n", GetLastError()); + } } static void test_FindCloseUrlCache(void)

1 0

Piotr Caban : wininet: Reserve more space for urlcache entry flags.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 122daa50bc8fdccbea0a2de8452e4d81b9f5c40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=122daa50bc8fdccbea0a2de84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 24 14:56:37 2012 +0200 wininet: Reserve more space for urlcache entry flags. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 89be901..5a4ed0b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -78,7 +78,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_LOCK 2 #define HASHTABLE_FREE 3 #define HASHTABLE_REDR 5 -#define HASHTABLE_FLAG_BITS 5 +#define HASHTABLE_FLAG_BITS 6 #define PENDING_DELETE_CACHE_ENTRY 0x00400000

1 0

Francois Gouget : kernel32: Add more flags for CompareString().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 4927f9595f761db454be21a6cbff2ef5f64706ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4927f9595f761db454be21a6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 13:04:00 2012 +0200 kernel32: Add more flags for CompareString(). And fix the name of SORT_STRINGSORT. --- include/winnls.h | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index d6bbc13..71b5a8f 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -342,12 +342,16 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define LOCALE_IDEFAULTUNIXCODEPAGE 0x1030 /* Wine extension */ -#define NORM_IGNORECASE 0x00001 -#define NORM_IGNORENONSPACE 0x00002 -#define NORM_IGNORESYMBOLS 0x00004 -#define NORM_STRINGSORT 0x01000 -#define NORM_IGNOREKANATYPE 0x10000 -#define NORM_IGNOREWIDTH 0x20000 +#define NORM_IGNORECASE 0x00000001 +#define NORM_IGNORENONSPACE 0x00000002 +#define NORM_IGNORESYMBOLS 0x00000004 +#define SORT_DIGITSASNUMBERS 0x00000008 +#define LINGUISTIC_IGNORECASE 0x00000010 +#define LINGUISTIC_IGNOREDIACRITIC 0x00000020 +#define SORT_STRINGSORT 0x00001000 +#define NORM_IGNOREKANATYPE 0x00010000 +#define NORM_IGNOREWIDTH 0x00020000 +#define NORM_LINGUISTIC_CASING 0x08000000 #define CP_ACP 0 #define CP_OEMCP 1

1 0

Francois Gouget : shell32/tests: Add a few more ShellExecute() file URL tests.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: e8a515c28f54f03610367bd781c95c48dc977a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a515c28f54f03610367bd78… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 13:07:15 2012 +0200 shell32/tests: Add a few more ShellExecute() file URL tests. --- dlls/shell32/tests/shlexec.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5130240..6fdde5c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1321,22 +1321,30 @@ typedef struct static fileurl_tests_t fileurl_tests[]= { - {"file:///", "%s\\nonexistent.shlexec", 0, 0x1}, + /* How many slashes does it take... */ + {"file:", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file:/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file://", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"File:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0x1}, - {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0x1}, {"file:////", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file://///", "%s\\test file.shlexec", 0, 0x1}, + + /* Test with Windows-style paths */ + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0x1}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0x1}, + + /* Check handling of hostnames */ {"file://localhost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file://localhost:80/", "%s\\test file.shlexec", 0, 0x1}, {"file://LocalHost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file://127.0.0.1/", "%s\\test file.shlexec", 0, 0x1}, {"file://::1/", "%s\\test file.shlexec", 0, 0x1}, {"file://notahost/", "%s\\test file.shlexec", 0, 0x1}, - {"file://www.winehq.org/", "%s\\test file.shlexec", 0, 0x1}, + + /* Environment variables are not expanded in URLs */ + {"%urlprefix%", "%s\\test file.shlexec", 0, 0x1}, + {"file:///", "%s\\%%urlenvvar%% file.shlexec", 0, 0x1}, {NULL, NULL, 0, 0} }; @@ -1357,6 +1365,8 @@ static void test_fileurl(void) } get_long_path_name(tmpdir, longtmpdir, sizeof(longtmpdir)/sizeof(*longtmpdir)); + SetEnvironmentVariable("urlprefix", "file:///"); + SetEnvironmentVariable("urlenvvar", "test"); test=fileurl_tests; while (test->basename) @@ -1423,6 +1433,9 @@ static void test_fileurl(void) } test++; } + + SetEnvironmentVariable("urlprefix", NULL); + SetEnvironmentVariable("urlenvvar", NULL); } static void test_find_executable(void)

1 0

Francois Gouget : shlwapi: Fix the declaration of UrlIsFileUrlW().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 340dee86f0ee6bd3c9029c1e950c8cd2fb2fc472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340dee86f0ee6bd3c9029c1e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 13:05:30 2012 +0200 shlwapi: Fix the declaration of UrlIsFileUrlW(). --- include/shlwapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index 2ebcdc9..cbfaabe 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -701,7 +701,7 @@ BOOL WINAPI UrlIsOpaqueW(LPCWSTR); #define UrlIsOpaque WINELIB_NAME_AW(UrlIsOpaque) #define UrlIsFileUrlA(x) UrlIsA(x, URLIS_FILEURL) -#define UrlIsFileUrlW(y) UrlIsW(x, URLIS_FILEURL) +#define UrlIsFileUrlW(x) UrlIsW(x, URLIS_FILEURL) #define UrlIsFileUrl WINELIB_NAME_AW(UrlIsFileUrl) HRESULT WINAPI UrlUnescapeA(LPSTR,LPSTR,LPDWORD,DWORD);

1 0

Francois Gouget : shlwapi/tests: Add more PathCreateFromUrl() tests.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 73f89e7e4cb150f7a555168c301fdf99e095f29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f89e7e4cb150f7a555168c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 13:05:13 2012 +0200 shlwapi/tests: Add more PathCreateFromUrl() tests. --- dlls/shlwapi/tests/path.c | 141 +++++++++++++++++++++++++++++++++------------ 1 files changed, 105 insertions(+), 36 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index cd5ee37..24eab7d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -39,34 +39,88 @@ static BOOL (WINAPI *pPathAppendA)(LPSTR, LPCSTR); static const struct { const char *url; const char *path; - DWORD ret; + DWORD ret, todo; } TEST_PATHFROMURL[] = { - {"file:///c:/foo/ba%5Cr", "c:\\foo\\ba\\r", S_OK}, - {"file:///c:/foo/../ba%5Cr", "c:\\foo\\..\\ba\\r", S_OK}, - {"file:///host/c:/foo/bar", "\\host\\c:\\foo\\bar", S_OK}, - {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file:\\\\host\\ca\\foo\\bar", "\\\\host\\ca\\foo\\bar", S_OK}, - {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK}, - {"file:\\%5Chost\\c:\\foo\\bar", "\\\\host\\c:\\foo\\bar", S_OK}, - {"file:\\\\host\\cx:\\foo\\bar", "\\\\host\\cx:\\foo\\bar", S_OK}, - {"file://c:/foo/bar", "c:\\foo\\bar", S_OK}, - {"file://c:/d:/foo/bar", "c:\\d:\\foo\\bar", S_OK}, - {"file://c|/d|/foo/bar", "c:\\d|\\foo\\bar", S_OK}, - {"file://host/foo/bar", "\\\\host\\foo\\bar", S_OK}, - {"file:/foo/bar", "\\foo\\bar", S_OK}, - {"file:/foo/bar/", "\\foo\\bar\\", S_OK}, - {"file:foo/bar", "foo\\bar", S_OK}, - {"file:c:/foo/bar", "c:\\foo\\bar", S_OK}, - {"file:c|/foo/bar", "c:\\foo\\bar", S_OK}, - {"file:cx|/foo/bar", "cx|\\foo\\bar", S_OK}, - {"file:////c:/foo/bar", "c:\\foo\\bar", S_OK}, -/* {"file:////c:/foo/foo%20bar", "c:\\foo\\foo%20bar", S_OK},*/ - - {"c:\\foo\\bar", NULL, E_INVALIDARG}, - {"foo/bar", NULL, E_INVALIDARG}, - {"http://foo/bar", NULL, E_INVALIDARG}, + /* 0 leading slash */ + {"file:c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:c|/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:cx|/foo/bar", "cx|\\foo\\bar", S_OK, 0}, + {"file:c:foo/bar", "c:foo\\bar", S_OK, 0}, + {"file:c|foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file:c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0x2}, + {"file:foo%20ba%2fr", "foo ba/r", S_OK, 0x2}, + {"file:foo/bar/", "foo\\bar\\", S_OK, 0}, + + /* 1 leading (back)slash */ + {"file:/c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:\\c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:/c|/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:/cx|/foo/bar", "\\cx|\\foo\\bar", S_OK, 0}, + {"file:/c:foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file:/c|foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file:/c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0x2}, + {"file:/foo%20ba%2fr", "\\foo ba/r", S_OK, 0x2}, + {"file:/foo/bar/", "\\foo\\bar\\", S_OK, 0}, + + /* 2 leading (back)slashes */ + {"file://c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file://c:/d:/foo/bar", "c:\\d:\\foo\\bar", S_OK, 0}, + {"file://c|/d|/foo/bar", "c:\\d|\\foo\\bar", S_OK, 0}, + {"file://cx|/foo/bar", "\\\\cx|\\foo\\bar", S_OK, 0}, + {"file://c:foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file://c|foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file://c:/foo%20ba%2fr", "c:\\foo%20ba%2fr", S_OK, 0x2}, + {"file://c%3a/foo/../bar", "\\\\c:\\foo\\..\\bar", S_OK, 0}, + {"file://c%7c/foo/../bar", "\\\\c|\\foo\\..\\bar", S_OK, 0x2}, + {"file://foo%20ba%2fr", "\\\\foo ba/r", S_OK, 0x2}, + {"file://localhost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x2}, + {"file://localhost/c:/foo%20ba%5Cr", "c:\\foo ba\\r", S_OK, 0x2}, + {"file://LocalHost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x2}, + {"file:\\\\localhost\\c:\\foo\\bar", "c:\\foo\\bar", S_OK, 0x2}, + {"file://incomplete", "\\\\incomplete", S_OK, 0}, + + /* 3 leading (back)slashes (omitting hostname) */ + {"file:///c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"File:///c:/foo/bar", "c:\\foo\\bar", S_OK, 0x1}, + {"file:///c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0x2}, + {"file:///foo%20ba%2fr", "\\foo ba/r", S_OK, 0x2}, + {"file:///foo/bar/", "\\foo\\bar\\", S_OK, 0}, + {"file:///localhost/c:/foo/bar", "\\localhost\\c:\\foo\\bar", S_OK, 0}, + + /* 4 leading (back)slashes */ + {"file:////c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:////c:/foo%20ba%2fr", "c:\\foo%20ba%2fr", S_OK, 0x2}, + {"file:////foo%20ba%2fr", "\\\\foo%20ba%2fr", S_OK, 0x2}, + + /* 5 and more leading (back)slashes */ + {"file://///c:/foo/bar", "\\\\c:\\foo\\bar", S_OK, 0x2}, + {"file://///c:/foo%20ba%2fr", "\\\\c:\\foo ba/r", S_OK, 0x2}, + {"file://///foo%20ba%2fr", "\\\\foo ba/r", S_OK, 0x2}, + {"file://////c:/foo/bar", "\\\\c:\\foo\\bar", S_OK, 0x2}, + + /* Leading (back)slashes cannot be escaped */ + {"file:%2f%2flocalhost%2fc:/foo/bar", "//localhost/c:\\foo\\bar", S_OK, 0x2}, + {"file:%5C%5Clocalhost%5Cc:/foo/bar", "\\\\localhost\\c:\\foo\\bar", S_OK, 0}, + + /* Hostname handling */ + {"file://l%6fcalhost/c:/foo/bar", "\\\\localhostc:\\foo\\bar", S_OK, 0}, + {"file://localhost:80/c:/foo/bar", "\\\\localhost:80c:\\foo\\bar", S_OK, 0}, + {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file://host//c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, + {"file://host/\\c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, + {"file://host/c:foo/bar", "\\\\hostc:foo\\bar", S_OK, 0x2}, + {"file://host/foo/bar", "\\\\host\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\ca\\foo\\bar", "\\\\host\\ca\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK, 0}, + {"file:\\%5Chost\\c:\\foo\\bar", "\\\\host\\c:\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\cx:\\foo\\bar", "\\\\host\\cx:\\foo\\bar", S_OK, 0}, + {"file:///host/c:/foo/bar", "\\host\\c:\\foo\\bar", S_OK, 0}, + + /* Not file URLs */ + {"c:\\foo\\bar", NULL, E_INVALIDARG, 0}, + {"foo/bar", NULL, E_INVALIDARG, 0}, + {"http://foo/bar", NULL, E_INVALIDARG, 0}, }; @@ -221,10 +275,17 @@ static void test_PathCreateFromUrl(void) for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); - if(TEST_PATHFROMURL[i].path) { - ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); - ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url); + if (!(TEST_PATHFROMURL[i].todo & 0x1)) + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); + else todo_wine + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); + if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { + if(!(TEST_PATHFROMURL[i].todo & 0x2)) { + ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); + ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url); + } else todo_wine + /* Wrong string, don't bother checking the length */ + ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } if (pPathCreateFromUrlW) { len = INTERNET_MAX_URL_LENGTH; @@ -232,11 +293,19 @@ static void test_PathCreateFromUrl(void) urlW = GetWideString(TEST_PATHFROMURL[i].url); ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),NULL,NULL); - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - if(TEST_PATHFROMURL[i].path) { - ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", - ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); - ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + if (!(TEST_PATHFROMURL[i].todo & 0x1)) + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); + else todo_wine + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); + if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { + if(!(TEST_PATHFROMURL[i].todo & 0x2)) { + ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", + ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); + ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + } else todo_wine + /* Wrong string, don't bother checking the length */ + ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", + ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } FreeWideString(urlW); FreeWideString(pathW);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012