wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Alexandre Julliard : dbghelp: Support pointer types of various sizes.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: cf1cd335701c099943530add958141fa75193426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1cd335701c099943530add9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 20:09:44 2011 +0100 dbghelp: Support pointer types of various sizes. --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/dwarf.c | 6 +- dlls/dbghelp/msc.c | 116 ++++++++++++++++++---------------------- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/type.c | 5 +- 5 files changed, 62 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf1cd335701c099943530…

1 0

Alexandre Julliard : libwine: Fall back to normal exec if the preloader doesn't exist.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 06f76236d1a9ee2f9136b0088cd0ba883437f5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f76236d1a9ee2f9136b0088… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 19:56:12 2011 +0100 libwine: Fall back to normal exec if the preloader doesn't exist. --- libs/wine/config.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 4a2bced..fdd4700 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -482,7 +482,6 @@ static void preloader_exec( char **argv, int use_preloader ) execv( full_name, new_argv ); free( new_argv ); free( full_name ); - return; } #endif execv( argv[0], argv );

1 0

Piotr Caban : shell32: Don' t check if files are of the same type if name is equal in IShellFolder2_CompareIDs .
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 856da7e11dec4f026c641d9fc7463fdadc04d98d URL: http://source.winehq.org/git/wine.git/?a=commit;h=856da7e11dec4f026c641d9fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 13 15:32:07 2011 +0100 shell32: Don't check if files are of the same type if name is equal in IShellFolder2_CompareIDs. --- dlls/shell32/shfldr_unixfs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index c779084..1c9b672 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1038,15 +1038,15 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_CompareIDs(IShellFolder2* iface, else if (isEmpty2) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)1); - if (_ILIsFolder(pidl1) && !_ILIsFolder(pidl2)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)-1); - if (!_ILIsFolder(pidl1) && _ILIsFolder(pidl2)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)1); - compare = CompareStringA(LOCALE_USER_DEFAULT, NORM_IGNORECASE, _ILGetTextPointer(pidl1), -1, _ILGetTextPointer(pidl2), -1); - + + if ((compare != CSTR_EQUAL) && _ILIsFolder(pidl1) && !_ILIsFolder(pidl2)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)-1); + if ((compare != CSTR_EQUAL) && !_ILIsFolder(pidl1) && _ILIsFolder(pidl2)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)1); + if ((compare == CSTR_LESS_THAN) || (compare == CSTR_GREATER_THAN)) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)((compare == CSTR_LESS_THAN)?-1:1));

1 0

Piotr Caban : shell32: Try to get file status from FileSystemBindData in UNIXFS_path_to_pidl.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: ad2201054c43d89f614d123e906a3dee02b8c071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2201054c43d89f614d123e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 13 15:31:52 2011 +0100 shell32: Try to get file status from FileSystemBindData in UNIXFS_path_to_pidl. --- dlls/shell32/shfldr_unixfs.c | 114 ++++++++++++++++++++++------------------- 1 files changed, 61 insertions(+), 53 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 628ab87..c779084 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -462,28 +462,6 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) } /****************************************************************************** - * UNIXFS_seconds_since_1970_to_dos_date_time [Internal] - * - * Convert unix time to FAT time - * - * PARAMS - * ss1970 [I] Unix time (seconds since 1970) - * pDate [O] Corresponding FAT date - * pTime [O] Corresponding FAT time - */ -static inline void UNIXFS_seconds_since_1970_to_dos_date_time( - time_t ss1970, LPWORD pDate, LPWORD pTime) -{ - LARGE_INTEGER time; - FILETIME fileTime; - - RtlSecondsSince1970ToTime( ss1970, &time ); - fileTime.dwLowDateTime = time.u.LowPart; - fileTime.dwHighDateTime = time.u.HighPart; - FileTimeToDosDateTime(&fileTime, pDate, pTime); -} - -/****************************************************************************** * UNIXFS_build_shitemid [Internal] * * Constructs a new SHITEMID for the last component of path 'pszUnixPath' into @@ -503,44 +481,51 @@ static inline void UNIXFS_seconds_since_1970_to_dos_date_time( * If what you need is a PIDLLIST with a single SHITEMID, don't forget to append * a 0 USHORT value. */ -static char* UNIXFS_build_shitemid(char *pszUnixPath, LPBC pbc, void *pIDL) { +static char* UNIXFS_build_shitemid(char *pszUnixPath, BOOL bMustExist, WIN32_FIND_DATAW *pFindData, void *pIDL) { LPPIDLDATA pIDLData; struct stat fileStat; + WIN32_FIND_DATAW findData; char *pszComponentU, *pszComponentA; WCHAR *pwszComponentW; int cComponentULen, cComponentALen; USHORT cbLen; FileStructW *pFileStructW; WORD uOffsetW, *pOffsetW; - BOOL must_exist = TRUE; - TRACE("(pszUnixPath=%s, pbc=%p, pIDL=%p)\n", debugstr_a(pszUnixPath), pbc, pIDL); + TRACE("(pszUnixPath=%s, bMustExsist=%s, pFindData=%p, pIDL=%p)\n", + debugstr_a(pszUnixPath), bMustExist ? "T" : "F", pFindData, pIDL); - if (pbc){ - IUnknown *unk; - IFileSystemBindData *fsb; - HRESULT hr; - - hr = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &unk); - if (SUCCEEDED(hr)) { - hr = IUnknown_QueryInterface(unk, &IID_IFileSystemBindData, (LPVOID*)&fsb); - if (SUCCEEDED(hr)) { - /* Windows tries to get WIN32_FIND_DATAW structure from - * fsb here for no known reason */ - must_exist = FALSE; - IFileSystemBindData_Release(fsb); - } - IUnknown_Release(unk); - } + if (pFindData) + memcpy(&findData, pFindData, sizeof(WIN32_FIND_DATAW)); + else { + memset(&findData, 0, sizeof(WIN32_FIND_DATAW)); + findData.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; } /* We are only interested in regular files and directories. */ if (stat(pszUnixPath, &fileStat)){ - if (must_exist || errno != ENOENT) + if (bMustExist || errno != ENOENT) return NULL; - }else - if (!S_ISDIR(fileStat.st_mode) && !S_ISREG(fileStat.st_mode)) + } else { + LARGE_INTEGER time; + + if (S_ISDIR(fileStat.st_mode)) + findData.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; + else if (S_ISREG(fileStat.st_mode)) + findData.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + else return NULL; + + findData.nFileSizeLow = (DWORD)fileStat.st_size; + findData.nFileSizeHigh = fileStat.st_size >> 32; + + RtlSecondsSince1970ToTime(fileStat.st_mtime, &time); + findData.ftLastWriteTime.dwLowDateTime = time.u.LowPart; + findData.ftLastWriteTime.dwHighDateTime = time.u.HighPart; + RtlSecondsSince1970ToTime(fileStat.st_atime, &time); + findData.ftLastAccessTime.dwLowDateTime = time.u.LowPart; + findData.ftLastAccessTime.dwHighDateTime = time.u.HighPart; + } /* Compute the SHITEMID's length and wipe it. */ pszComponentU = strrchr(pszUnixPath, '/') + 1; @@ -552,12 +537,12 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, LPBC pbc, void *pIDL) { /* Set shell32's standard SHITEMID data fields. */ pIDLData = _ILGetDataPointer(pIDL); - pIDLData->type = S_ISDIR(fileStat.st_mode) ? PT_FOLDER : PT_VALUE; - pIDLData->u.file.dwFileSize = (DWORD)fileStat.st_size; - UNIXFS_seconds_since_1970_to_dos_date_time(fileStat.st_mtime, &pIDLData->u.file.uFileDate, - &pIDLData->u.file.uFileTime); + pIDLData->type = (findData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) ? PT_FOLDER : PT_VALUE; + pIDLData->u.file.dwFileSize = findData.nFileSizeLow; + FileTimeToDosDateTime(&findData.ftLastWriteTime, &pIDLData->u.file.uFileDate, + &pIDLData->u.file.uFileTime); pIDLData->u.file.uFileAttribs = 0; - if (S_ISDIR(fileStat.st_mode)) pIDLData->u.file.uFileAttribs |= FILE_ATTRIBUTE_DIRECTORY; + pIDLData->u.file.uFileAttribs |= findData.dwFileAttributes; if (pszComponentU[0] == '.') pIDLData->u.file.uFileAttribs |= FILE_ATTRIBUTE_HIDDEN; cComponentALen = lstrlenA(pszComponentA) + 1; memcpy(pIDLData->u.file.szNames, pszComponentA, cComponentALen); @@ -565,9 +550,9 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, LPBC pbc, void *pIDL) { pFileStructW = (FileStructW*)(pIDLData->u.file.szNames + cComponentALen + (cComponentALen & 0x1)); uOffsetW = (WORD)(((LPBYTE)pFileStructW) - ((LPBYTE)pIDL)); pFileStructW->cbLen = cbLen - uOffsetW; - UNIXFS_seconds_since_1970_to_dos_date_time(fileStat.st_mtime, &pFileStructW->uCreationDate, + FileTimeToDosDateTime(&findData.ftLastWriteTime, &pFileStructW->uCreationDate, &pFileStructW->uCreationTime); - UNIXFS_seconds_since_1970_to_dos_date_time(fileStat.st_atime, &pFileStructW->uLastAccessDate, + FileTimeToDosDateTime(&findData.ftLastAccessTime, &pFileStructW->uLastAccessDate, &pFileStructW->uLastAccessTime); lstrcpyW(pFileStructW->wszName, pwszComponentW); @@ -601,6 +586,8 @@ static HRESULT UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, LPBC pbc, const WCHA int cPidlLen, cPathLen; char *pSlash, *pNextSlash, szCompletePath[FILENAME_MAX], *pNextPathElement, *pszAPath; WCHAR *pwszPath; + WIN32_FIND_DATAW find_data; + BOOL must_exist = TRUE; TRACE("pUnixFolder=%p, pbc=%p, path=%s, ppidl=%p\n", pUnixFolder, pbc, debugstr_w(path), ppidl); @@ -691,11 +678,32 @@ static HRESULT UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, LPBC pbc, const WCHA *ppidl = pidl = SHAlloc(cPidlLen); if (!pidl) return E_FAIL; + if (pbc) { + IUnknown *unk; + IFileSystemBindData *fsb; + HRESULT hr; + + hr = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &unk); + if (SUCCEEDED(hr)) { + hr = IUnknown_QueryInterface(unk, &IID_IFileSystemBindData, (LPVOID*)&fsb); + if (SUCCEEDED(hr)) { + hr = IFileSystemBindData_GetFindData(fsb, &find_data); + if (FAILED(hr)) + memset(&find_data, 0, sizeof(WIN32_FIND_DATAW)); + + must_exist = FALSE; + IFileSystemBindData_Release(fsb); + } + IUnknown_Release(unk); + } + } + /* Concatenate the SHITEMIDs of the sub-directories. */ while (*pNextPathElement) { pSlash = strchr(pNextPathElement+1, '/'); if (pSlash) *pSlash = '\0'; - pNextPathElement = UNIXFS_build_shitemid(szCompletePath, pbc, pidl); + pNextPathElement = UNIXFS_build_shitemid(szCompletePath, must_exist, + must_exist&&!pSlash ? &find_data : NULL, pidl); if (pSlash) *pSlash = '/'; if (!pNextPathElement) { @@ -2426,7 +2434,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Next(IEnumIDList* iface, lstrcpyA(pszRelativePath, pDirEntry->d_name); rgelt[i] = SHAlloc( UNIXFS_shitemid_len_from_filename(pszRelativePath, NULL, NULL)+sizeof(USHORT)); - if (!UNIXFS_build_shitemid(This->m_szFolder, NULL, rgelt[i]) || + if (!UNIXFS_build_shitemid(This->m_szFolder, TRUE, NULL, rgelt[i]) || !UNIXFS_is_pidl_of_type(rgelt[i], This->m_fFilter)) { SHFree(rgelt[i]);

1 0

Hans Leidekker : msi/tests: Accept one more estimated size.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: e6e454ab162293414b8ece64c4f4abce29f916f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e454ab162293414b8ece64c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 13 15:23:40 2011 +0100 msi/tests: Accept one more estimated size. --- dlls/msi/tests/action.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 4ab5df6..241a917 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2417,7 +2417,7 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); } -static void check_reg_dword2(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD line) +static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line) { DWORD val, size, type; LONG res; @@ -2431,10 +2431,12 @@ static void check_reg_dword2(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e return; } - ok_(__FILE__, line)(val == expected1 || val == expected2, "Expected %d or %d, got %d\n", expected1, expected2, val); + ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3, + "Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val); } -static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line) +static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, + DWORD expected4, DWORD line) { DWORD val, size, type; LONG res; @@ -2448,8 +2450,8 @@ static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e return; } - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3, - "Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val); + ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4, + "Expected %d, %d or %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); } #define CHECK_REG_STR(prodkey, name, expected) \ @@ -2487,6 +2489,10 @@ static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); \ RegDeleteValueA(prodkey, name); +#define CHECK_DEL_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ + check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); \ + RegDeleteValueA(prodkey, name); + static void get_date_str(LPSTR date) { SYSTEMTIME systime; @@ -2590,7 +2596,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4); + CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10); } delete_key(hkey, "", access); @@ -2628,7 +2634,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4); + CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10); } delete_key(props, "", access); @@ -2697,7 +2703,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4); + CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10); } delete_key(hkey, "", access); @@ -2735,7 +2741,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4); + CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10); } delete_key(props, "", access); @@ -3578,7 +3584,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey); @@ -3660,7 +3666,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey); @@ -3743,7 +3749,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey); @@ -3803,7 +3809,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey); @@ -3863,7 +3869,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -20); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -20, 10); } RegCloseKey(prodkey); @@ -3946,7 +3952,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey);

1 0

Hans Leidekker : msi: Fix some memory leaks (valgrind).
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 257beae1fd7d5a60ecf64f9978e9222f62958d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=257beae1fd7d5a60ecf64f997… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 13 15:23:21 2011 +0100 msi: Fix some memory leaks (valgrind). --- dlls/msi/package.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c7e1f98..5606d28 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -112,6 +112,9 @@ static void free_extension( MSIEXTENSION *ext ) static void free_assembly( MSIASSEMBLY *assembly ) { + msi_free( assembly->feature ); + msi_free( assembly->manifest ); + msi_free( assembly->application ); msi_free( assembly->display_name ); if (assembly->tempdir) RemoveDirectoryW( assembly->tempdir ); msi_free( assembly->tempdir );

1 0

Jacek Caban : wininet: Fixed memory leak in tests (valgrind).
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 2f4968b5979c9cc83d79825a442b3172b7a1cd2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4968b5979c9cc83d79825a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 13 13:54:38 2011 +0100 wininet: Fixed memory leak in tests (valgrind). --- dlls/wininet/tests/http.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 16a29ce..2b0092a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2592,6 +2592,15 @@ static void test_http_connection(void) CloseHandle(hThread); } +static void release_cert_info(INTERNET_CERTIFICATE_INFOA *info) +{ + LocalFree(info->lpszSubjectInfo); + LocalFree(info->lpszIssuerInfo); + LocalFree(info->lpszProtocolName); + LocalFree(info->lpszSignatureAlgName); + LocalFree(info->lpszEncryptionAlgName); +} + static void test_secure_connection(void) { static const WCHAR gizmo5[] = {'G','i','z','m','o','5',0}; @@ -2627,6 +2636,7 @@ static void test_secure_connection(void) ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == sizeof(INTERNET_CERTIFICATE_INFOA), "size = %d\n", size); certificate_structA = HeapAlloc(GetProcessHeap(), 0, size); ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, certificate_structA, &size); @@ -2646,6 +2656,7 @@ static void test_secure_connection(void) ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); + release_cert_info(certificate_structA); } HeapFree(GetProcessHeap(), 0, certificate_structA); @@ -2656,6 +2667,7 @@ static void test_secure_connection(void) ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == sizeof(INTERNET_CERTIFICATE_INFOW), "size = %d\n", size); certificate_structW = HeapAlloc(GetProcessHeap(), 0, size); ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, certificate_structW, &size); @@ -2676,6 +2688,7 @@ static void test_secure_connection(void) ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); + release_cert_info(certificate_structA); } HeapFree(GetProcessHeap(), 0, certificate_structW); @@ -2707,6 +2720,7 @@ static void test_secure_connection(void) ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == sizeof(INTERNET_CERTIFICATE_INFOA), "size = %d\n", size); certificate_structA = HeapAlloc(GetProcessHeap(), 0, size); ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, certificate_structA, &size); @@ -2726,6 +2740,7 @@ static void test_secure_connection(void) ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); + release_cert_info(certificate_structA); } HeapFree(GetProcessHeap(), 0, certificate_structA); @@ -2736,6 +2751,7 @@ static void test_secure_connection(void) ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == sizeof(INTERNET_CERTIFICATE_INFOW), "size = %d\n", size); certificate_structW = HeapAlloc(GetProcessHeap(), 0, size); ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, certificate_structW, &size); @@ -2756,6 +2772,7 @@ static void test_secure_connection(void) ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); + release_cert_info(certificate_structA); } HeapFree(GetProcessHeap(), 0, certificate_structW);

1 0

Jacek Caban : wininet: Added post data tests.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 0662555af33bd8bee5e7cf0ecdc135a3151158d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0662555af33bd8bee5e7cf0ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 13 13:54:23 2011 +0100 wininet: Added post data tests. --- dlls/wininet/tests/http.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7872297..16a29ce 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -114,7 +114,10 @@ typedef struct { const char *redirected_url; const char *host; const char *path; + const char *headers; DWORD flags; + const char *post_data; + const char *content; } test_data_t; static const test_data_t test_data[] = { @@ -123,6 +126,7 @@ static const test_data_t test_data[] = { "http://test.winehq.org/hello.html", "test.winehq.org", "/testredirect", + "", TESTF_REDIRECT }, { @@ -130,7 +134,18 @@ static const test_data_t test_data[] = { "http://www.codeweavers.com/", "www.codeweavers.com", "", + "Accept-Encoding: gzip, deflate", TESTF_COMPRESSED|TESTF_ALLOW_COOKIE + }, + { + "http://crossover.codeweavers.com/posttest.php", + "http://crossover.codeweavers.com/posttest.php", + "crossover.codeweavers.com", + "/posttest.php", + "Content-Type: application/x-www-form-urlencoded", + 0, + "mode=Test", + "mode => Test\n" } }; @@ -270,9 +285,10 @@ static VOID WINAPI callback( static void InternetReadFile_test(int flags, const test_data_t *test) { + char *post_data = NULL; BOOL res; CHAR buffer[4000]; - DWORD length; + DWORD length, post_len = 0; DWORD out; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -305,7 +321,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", test->path, NULL, NULL, types, + hor = HttpOpenRequestA(hic, test->post_data ? "POST" : "GET", test->path, NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -383,8 +399,13 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } trace("HttpSendRequestA -->\n"); + if(test->post_data) { + post_len = strlen(test->post_data); + post_data = HeapAlloc(GetProcessHeap(), 0, post_len); + memcpy(post_data, test->post_data, post_len); + } SetLastError(0xdeadbeef); - res = HttpSendRequestA(hor, (test->flags & TESTF_COMPRESSED) ? "Accept-Encoding: gzip, deflate" : "", -1, NULL, 0); + res = HttpSendRequestA(hor, test->headers, -1, post_data, post_len); if (flags & INTERNET_FLAG_ASYNC) ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); @@ -395,6 +416,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if (flags & INTERNET_FLAG_ASYNC) WaitForSingleObject(hCompleteEvent, INFINITE); + HeapFree(GetProcessHeap(), 0, post_data); if(test->flags & TESTF_ALLOW_COOKIE) { CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); @@ -501,6 +523,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) trace("ReadFile -> %s %i\n",res?"TRUE":"FALSE",length); + if(test->content) + ok(!strcmp(buffer, test->content), "buffer = '%s', expected '%s'\n", buffer, test->content); HeapFree(GetProcessHeap(),0,buffer); } if (length == 0) @@ -3178,4 +3202,5 @@ START_TEST(http) test_bogus_accept_types_array(); InternetReadFile_chunked_test(); HttpSendRequestEx_test(); + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); }

1 0

Kusanagi Kouichi : gdi32: GetCharABCWidthsA should work for DBCS.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 5c987fc57403a4ed26cd35b33318069913a66ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c987fc57403a4ed26cd35b33… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Jan 13 19:18:16 2011 +0900 gdi32: GetCharABCWidthsA should work for DBCS. --- dlls/gdi32/font.c | 27 +++++++++++++++++++++------ dlls/gdi32/tests/font.c | 1 - 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fe68893..5d47ca6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2296,18 +2296,33 @@ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, LPABC abc ) { - INT i, wlen, count = (INT)(lastChar - firstChar + 1); + INT i, wlen; + UINT c; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; - if(count <= 0) return FALSE; + if (lastChar < firstChar) + return FALSE; - str = HeapAlloc(GetProcessHeap(), 0, count); - for(i = 0; i < count; i++) - str[i] = (BYTE)(firstChar + i); + str = HeapAlloc(GetProcessHeap(), 0, (lastChar - firstChar + 1) * 2 + 1); + if (str == NULL) + return FALSE; - wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL); + for(i = 0, c = firstChar; c <= lastChar; i++, c++) + { + if (c > 0xff) + str[i++] = (BYTE)(c >> 8); + str[i] = (BYTE)c; + } + str[i] = '\0'; + + wstr = FONT_mbtowc(hdc, str, -1, &wlen, NULL); + if (wstr == NULL) + { + HeapFree(GetProcessHeap(), 0, str); + return FALSE; + } for(i = 0; i < wlen; i++) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9b9a5b4..a8c28f4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -973,7 +973,6 @@ static void test_GetCharABCWidths(void) memset(a, 0, sizeof a); memset(w, 0, sizeof w); hfont = SelectObject(hdc, hfont); - todo_wine ok(pGetCharABCWidthsA(hdc, c[i].a, c[i].a + 1, a) && pGetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) && memcmp(a, w, sizeof a) == 0,

1 0

Kusanagi Kouichi : gdi32/tests: Add a test for GetCharABCWidthsA with DBCS.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: fcb4a1610e97cde8ec8c266f2c7817768a4ba3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb4a1610e97cde8ec8c266f2… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Jan 13 19:17:45 2011 +0900 gdi32/tests: Add a test for GetCharABCWidthsA with DBCS. --- dlls/gdi32/tests/font.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4230ebc..9b9a5b4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -38,6 +38,7 @@ static LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); +static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -55,6 +56,7 @@ static void init(void) pGdiGetCharDimensions = (void *)GetProcAddress(hgdi32, "GdiGetCharDimensions"); pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); + pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); @@ -873,6 +875,25 @@ static void test_GdiGetCharDimensions(void) DeleteDC(hdc); } +static int CALLBACK create_font_proc(const LOGFONT *lpelfe, + const TEXTMETRIC *lpntme, + DWORD FontType, LPARAM lParam) +{ + if (FontType & TRUETYPE_FONTTYPE) + { + HFONT hfont; + + hfont = CreateFontIndirect(lpelfe); + if (hfont) + { + *(HFONT *)lParam = hfont; + return 0; + } + } + + return 1; +} + static void test_GetCharABCWidths(void) { static const WCHAR str[] = {'a',0}; @@ -883,10 +904,24 @@ static void test_GetCharABCWidths(void) ABC abc[1]; WORD glyphs[1]; DWORD nb; + static const struct + { + UINT cs; + UINT a; + UINT w; + } c[] = + { + {SHIFTJIS_CHARSET, 0x82a0, 0x3042}, + {HANGEUL_CHARSET, 0x8141, 0xac02}, + {JOHAB_CHARSET, 0x8446, 0x3135}, + {GB2312_CHARSET, 0x8141, 0x4e04}, + {CHINESEBIG5_CHARSET, 0xa142, 0x3001} + }; + UINT i; - if (!pGetCharABCWidthsW || !pGetCharABCWidthsI) + if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsI) { - win_skip("GetCharABCWidthsW/I not available on this platform\n"); + win_skip("GetCharABCWidthsA/W/I not available on this platform\n"); return; } @@ -921,6 +956,32 @@ static void test_GetCharABCWidths(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + for (i = 0; i < sizeof c / sizeof c[0]; ++i) + { + ABC a[2], w[2]; + + lf.lfFaceName[0] = '\0'; + lf.lfCharSet = c[i].cs; + lf.lfPitchAndFamily = 0; + if (EnumFontFamiliesEx(hdc, &lf, create_font_proc, (LPARAM)&hfont, 0)) + { + skip("TrueType font for charset %u is not installed\n", c[i].cs); + continue; + } + + memset(a, 0, sizeof a); + memset(w, 0, sizeof w); + hfont = SelectObject(hdc, hfont); + todo_wine + ok(pGetCharABCWidthsA(hdc, c[i].a, c[i].a + 1, a) && + pGetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) && + memcmp(a, w, sizeof a) == 0, + "GetCharABCWidthsA and GetCharABCWidthsW should return same widths. charset = %u\n", c[i].cs); + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + } + ReleaseDC(NULL, hdc); }

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
88
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 January 2011