July 2014 - Wine-Commits - list.winehq.org

Sebastian Lackner : wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind).
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 8fd44a3d2b7438fbf1e7fcfa7482147999ff4851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd44a3d2b7438fbf1e7fcfa7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 2 01:23:40 2014 +0200 wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind). --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b5e6a73..bb53a03 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3589,12 +3589,12 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, TRACE("returning data: %s\n", debugstr_wn(headers, len / sizeof(WCHAR))); - for (i=0; i<len; i++) + for (i = 0; i < len / sizeof(WCHAR); i++) { if (headers[i] == '\n') headers[i] = 0; } - memcpy(lpBuffer, headers, len + sizeof(WCHAR)); + memcpy(lpBuffer, headers, len); } *lpdwBufferLength = len - sizeof(WCHAR); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4e8ea5b..a8b55fd 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -465,6 +465,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; + WCHAR wbuffer[4000]; DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -649,6 +650,37 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); + length = sizeof(wbuffer)-sizeof(WCHAR); + memset(wbuffer, 0x77, sizeof(wbuffer)); + res = HttpQueryInfoW(hor, HTTP_QUERY_RAW_HEADERS, wbuffer, &length, 0x0); + ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length); + length /= sizeof(WCHAR); + /* show that the function writes data past the length returned */ + ok(wbuffer[length-2], "Expected any header character, got 0x0000\n"); + ok(!wbuffer[length-1], "Expected 0x0000, got %04X\n", wbuffer[length-1]); + ok(!wbuffer[length], "Expected 0x0000, got %04X\n", wbuffer[length]); + ok(wbuffer[length+1] == 0x7777 || broken(wbuffer[length+1] != 0x7777), + "Expected 0x7777, got %04X\n", wbuffer[length+1]); + + length2 = length*sizeof(WCHAR); + res = HttpQueryInfoW(hor,HTTP_QUERY_RAW_HEADERS,wbuffer,&length2,0x0); + ok(!res, "Expected 0x00, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(length2 % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length2); + length2 /= sizeof(WCHAR); + ok(length2 == length+1, "Expected %d, got %d\n", length+1, length2); + /* the in length of the buffer must be +1 but the length returned does not count this */ + length2 = (length+1)*sizeof(WCHAR); + memset(wbuffer, 0x77, sizeof(wbuffer)); + res = HttpQueryInfoW(hor,HTTP_QUERY_RAW_HEADERS,wbuffer,&length2,0x0); + ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length2 % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length2); + length2 /= sizeof(WCHAR); + ok(!wbuffer[length2], "Expected 0x0000, got %04X\n", wbuffer[length2]); + ok(wbuffer[length2+1] == 0x7777, "Expected 0x7777, got %04X\n", wbuffer[length2+1]); + ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); + length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError());

1 0

Andrew Eikum : winecoreaudio.drv: Use AUHAL API instead of AudioQueue.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 46928d381ee4dcf95a0ac409be52729407f4eaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=46928d381ee4dcf95a0ac409b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 1 14:53:45 2014 -0500 winecoreaudio.drv: Use AUHAL API instead of AudioQueue. --- dlls/winecoreaudio.drv/mmdevdrv.c | 1181 +++++++++++++++++++------------------ 1 file changed, 603 insertions(+), 578 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46928d381ee4dcf95a0ac…

1 0

Vincent Povirk : winebrowser: Don't use IUriBuilder with unix file: uri's.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 5af3b8c97e8f537d8a4f01382acb7127bcfb8f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af3b8c97e8f537d8a4f01382… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 1 14:09:39 2014 -0500 winebrowser: Don't use IUriBuilder with unix file: uri's. --- programs/winebrowser/main.c | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 6938e1e..cb9ea73 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -311,11 +311,12 @@ done: static WCHAR *encode_unix_path(const char *src) { - int len = 1; const char *tmp_src; WCHAR *dst, *tmp_dst; const char safe_chars[] = "/-_.~@&=+$,:"; const char hex_digits[] = "0123456789ABCDEF"; + const WCHAR schema[] = {'f','i','l','e',':','/','/',0}; + int len = sizeof(schema)/sizeof(schema[0]); tmp_src = src; @@ -336,8 +337,10 @@ static WCHAR *encode_unix_path(const char *src) if (!dst) return NULL; + strcpyW(dst, schema); + tmp_src = src; - tmp_dst = dst; + tmp_dst = dst + strlenW(dst); while (*tmp_src != 0) { @@ -362,15 +365,13 @@ static WCHAR *encode_unix_path(const char *src) return dst; } -static IUri *convert_file_uri(IUri *uri) +static WCHAR *convert_file_uri(IUri *uri) { wine_get_unix_file_name_t wine_get_unix_file_name_ptr; - IUriBuilder *uri_builder; struct stat dummy; WCHAR *new_path; char *unixpath; BSTR filename; - IUri *new_uri; HRESULT hres; /* check if the argument is a local file */ @@ -399,19 +400,7 @@ static IUri *convert_file_uri(IUri *uri) WINE_TRACE("New path: %s\n", wine_dbgstr_w(new_path)); - hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); - if(SUCCEEDED(hres) && new_path) - hres = IUriBuilder_SetPath(uri_builder, new_path); - HeapFree(GetProcessHeap(), 0, new_path); - if(FAILED(hres)) - return NULL; - - hres = IUriBuilder_CreateUri(uri_builder, 0, 0, 0, &new_uri); - IUriBuilder_Release(uri_builder); - if(FAILED(hres)) - return NULL; - - return new_uri; + return new_path; } /***************************************************************************** @@ -423,7 +412,7 @@ int wmain(int argc, WCHAR *argv[]) static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; WCHAR *url = argv[1]; - BSTR display_uri; + BSTR display_uri = NULL; DWORD scheme; IUri *uri; HRESULT hres; @@ -451,18 +440,14 @@ int wmain(int argc, WCHAR *argv[]) IUri_GetScheme(uri, &scheme); if(scheme == URL_SCHEME_FILE) { - IUri *file_uri; - - file_uri = convert_file_uri(uri); - if(file_uri) { - IUri_Release(uri); - uri = file_uri; - }else { + display_uri = convert_file_uri(uri); + if(!display_uri) { WINE_ERR("Failed to convert file URL to unix path\n"); } } - hres = IUri_GetDisplayUri(uri, &display_uri); + if (!display_uri) + hres = IUri_GetDisplayUri(uri, &display_uri); IUri_Release(uri); if(FAILED(hres)) return -1;

1 0

Vincent Povirk : winebrowser: Add traces for file uri conversion steps.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: c5f000632f75010739c0b7c21e85c368e8a1c9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f000632f75010739c0b7c21… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 1 11:37:39 2014 -0500 winebrowser: Add traces for file uri conversion steps. --- programs/winebrowser/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 6ce7707..6938e1e 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -383,9 +383,12 @@ static IUri *convert_file_uri(IUri *uri) if(FAILED(hres)) return NULL; + WINE_TRACE("Windows path: %s\n", wine_dbgstr_w(filename)); + unixpath = wine_get_unix_file_name_ptr(filename); SysFreeString(filename); if(unixpath && stat(unixpath, &dummy) >= 0) { + WINE_TRACE("Unix path: %s\n", wine_dbgstr_a(unixpath)); new_path = encode_unix_path(unixpath); HeapFree(GetProcessHeap(), 0, unixpath); }else { @@ -394,6 +397,8 @@ static IUri *convert_file_uri(IUri *uri) new_path = NULL; } + WINE_TRACE("New path: %s\n", wine_dbgstr_w(new_path)); + hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); if(SUCCEEDED(hres) && new_path) hres = IUriBuilder_SetPath(uri_builder, new_path);

1 0

Jacek Caban : urlmon: Don' t decode percent-encoded characters in file URLs with implicit scheme.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: e656914fbf4cdb774c8db8dc9ebf631693a1fdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e656914fbf4cdb774c8db8dc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 2 13:22:50 2014 +0200 urlmon: Don't decode percent-encoded characters in file URLs with implicit scheme. --- dlls/urlmon/uri.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2fe0113..1f18bc6 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2838,7 +2838,7 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags * file:///c:/test%test -> file:///c:/test%25test */ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, URL_SCHEME scheme_type, BOOL has_host, DWORD flags, - WCHAR *ret_path) { + BOOL is_implicit_scheme, WCHAR *ret_path) { const BOOL known_scheme = scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = scheme_type == URL_SCHEME_FILE; const BOOL is_res = scheme_type == URL_SCHEME_RES; @@ -2904,7 +2904,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U len += 3; do_default_action = FALSE; } else if((is_unreserved(val) && known_scheme) || - (is_file && (is_unreserved(val) || is_reserved(val) || + (is_file && !is_implicit_scheme && (is_unreserved(val) || is_reserved(val) || (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { if(ret_path) ret_path[len] = val; @@ -2929,7 +2929,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U } } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { - if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { + if(!is_file || !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Escape the forbidden character. */ if(ret_path) pct_encode_val(*ptr, ret_path+len); @@ -3122,7 +3122,7 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, if(!computeOnly) uri->path_start = uri->canon_len; uri->path_len = canonicalize_path_hierarchical(data->path, data->path_len, data->scheme_type, data->host_len != 0, - flags, computeOnly ? NULL : uri->canon_uri+uri->canon_len); + flags, data->has_implicit_scheme, computeOnly ? NULL : uri->canon_uri+uri->canon_len); uri->canon_len += uri->path_len; if(!computeOnly && !uri->path_len) uri->path_start = -1; @@ -3889,8 +3889,8 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) return S_OK; } - len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, NULL); - len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, NULL); + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, NULL); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, NULL); canon_path_a = heap_alloc(len_a*sizeof(WCHAR)); if(!canon_path_a) @@ -3901,8 +3901,8 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) return E_OUTOFMEMORY; } - len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, canon_path_a); - len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, canon_path_b); + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, canon_path_a); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, canon_path_b); *ret = len_a == len_b && !memicmpW(canon_path_a, canon_path_b, len_a);

1 0

Joris van der Wel : advapi32/tests: Changed an invalid comment.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: c3f87add45d1172ede6de0e12093657cb9e9a4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f87add45d1172ede6de0e12… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:47:37 2014 +0200 advapi32/tests: Changed an invalid comment. --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d75354f..a394620 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2547,7 +2547,7 @@ static void test_process_security(void) CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_INVALID_SECURITY_DESCR ); CHECK_SET_SECURITY( event, SACL_SECURITY_INFORMATION, ERROR_ACCESS_DENIED ); CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); - /* NULL DACL is valid and means default DACL from token */ + /* NULL DACL is valid and means that everyone has access */ SecurityDescriptor->Control |= SE_DACL_PRESENT; CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS );

1 0

Bruno Jesus : rsaenh/tests: Add more AES encrypt/decrypt tests.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 87f214c7ff9bab466a0ff1697acbbd0bf5fbad76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f214c7ff9bab466a0ff1697… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 1 01:05:41 2014 -0300 rsaenh/tests: Add more AES encrypt/decrypt tests. --- dlls/rsaenh/tests/rsaenh.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index f0b7b19..abc90e1 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1048,24 +1048,54 @@ static void test_aes(int keylen) HCRYPTKEY hKey; BOOL result; DWORD dwLen, dwMode; - unsigned char pbData[16], enc_data[16], bad_data[16]; + unsigned char pbData[48], enc_data[16], bad_data[16]; int i; - + static const BYTE aes_plain[32] = { + "AES Test With 2 Blocks Of Data." }; + static const BYTE aes_cbc_enc[3][48] = { + /* 128 bit key encrypted text */ + { 0xfe, 0x85, 0x3b, 0xe1, 0xf5, 0xe1, 0x58, 0x75, 0xd5, 0xa9, 0x74, 0xe3, 0x09, 0xea, 0xa5, 0x04, + 0x23, 0x35, 0xa2, 0x3b, 0x5c, 0xf1, 0x6c, 0x6f, 0xb9, 0xcd, 0x64, 0x06, 0x3e, 0x41, 0x83, 0xef, + 0x2a, 0xfe, 0xea, 0xb5, 0x6c, 0x17, 0x20, 0x79, 0x8c, 0x51, 0x3e, 0x56, 0xed, 0xe1, 0x47, 0x68 }, + /* 192 bit key encrypted text */ + { 0x6b, 0xf0, 0xfd, 0x32, 0xee, 0xc6, 0x06, 0x13, 0xa8, 0xe6, 0x3c, 0x81, 0x85, 0xb8, 0x2e, 0xa1, + 0xd4, 0x3b, 0xe8, 0x22, 0xa5, 0x74, 0x4a, 0xbe, 0x9d, 0xcf, 0xcc, 0x37, 0x26, 0x19, 0x5a, 0xd1, + 0x7f, 0x76, 0xbf, 0x94, 0x28, 0xce, 0x27, 0x21, 0x61, 0x87, 0xeb, 0xb9, 0x8b, 0xa8, 0xb4, 0x57 }, + /* 256 bit key encrypted text */ + { 0x20, 0x57, 0x17, 0x0b, 0x17, 0x76, 0xd8, 0x3b, 0x26, 0x90, 0x8b, 0x4c, 0xf2, 0x00, 0x79, 0x33, + 0x29, 0x2b, 0x13, 0x9c, 0xe2, 0x95, 0x09, 0xc1, 0xcd, 0x20, 0x87, 0x22, 0x32, 0x70, 0x9d, 0x75, + 0x9a, 0x94, 0xf5, 0x76, 0x5c, 0xb1, 0x62, 0x2c, 0xe1, 0x76, 0x7c, 0x86, 0x73, 0xe6, 0x7a, 0x23 } + }; switch (keylen) { case 256: result = derive_key(CALG_AES_256, &hKey, 0); + i = 2; break; case 192: result = derive_key(CALG_AES_192, &hKey, 0); + i = 1; break; default: case 128: result = derive_key(CALG_AES_128, &hKey, 0); + i = 0; break; } if (!result) return; + dwLen = sizeof(aes_plain); + memcpy(pbData, aes_plain, dwLen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); + ok(result, "Expected OK, got last error %d\n", GetLastError()); + ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); +todo_wine + ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); + ok(result && dwLen == 32 && !memcmp(aes_plain, pbData, dwLen), + "%08x, dwLen: %d\n", GetLastError(), dwLen); + for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; /* Does AES provider support salt? */

1 0

Vincent Povirk : ole32: Simplify the FileMonikerImpl_BindToStorage code.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 69ff6f74b25866d55a8c13053836796243902c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ff6f74b25866d55a8c13053… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 30 13:40:02 2014 -0500 ole32: Simplify the FileMonikerImpl_BindToStorage code. --- dlls/ole32/filemoniker.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 06c4798..c7bbb66 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -605,22 +605,11 @@ FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef /* get the file name */ IMoniker_GetDisplayName(iface,pbc,pmkToLeft,&filePath); - /* verify if the file contains a storage object */ - res=StgIsStorageFile(filePath); + res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - if(res==S_OK){ + if (SUCCEEDED(res)) + *ppvObject=pstg; - res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - - if (SUCCEEDED(res)){ - - *ppvObject=pstg; - - IStorage_AddRef(pstg); - - return res; - } - } CoTaskMemFree(filePath); } else

1 0

Henri Verbeet : ddraw/tests: Get rid of struct tvertex.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: ecf20e2630050284e913d54fae773db58c1e92af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf20e2630050284e913d54fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:32 2014 +0200 ddraw/tests: Get rid of struct tvertex. --- dlls/ddraw/tests/visual.c | 62 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index f24c6cc..7be1f34 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -28,6 +28,11 @@ struct vec3 float x, y, z; }; +struct vec4 +{ + float x, y, z, w; +}; + static HWND window; static IDirectDraw7 *DirectDraw; static IDirectDrawSurface7 *Surface; @@ -269,12 +274,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -struct tvertex -{ - float x, y, z, w; - DWORD diffuse; -}; - struct nvertex { float x, y, z; @@ -2981,33 +2980,38 @@ out: */ static void depth_clamp_test(IDirect3DDevice7 *device) { - struct tvertex quad1[] = + struct { - { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - }; - struct tvertex quad2[] = + struct vec4 position; + DWORD diffuse; + } + quad1[] = { - { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - }; - struct tvertex quad3[] = + {{ 0.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{ 0.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + }, + quad2[] = { - {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - }; - struct tvertex quad4[] = + {{ 0.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{ 0.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + }, + quad3[] = + { + {{112.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{112.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + }, + quad4[] = { - { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, + {{ 42.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{ 42.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, }; struct {

1 0

Frédéric Delanoy : Assorted spelling/ grammar fixes.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 95ae71f3ab47c57b6a3af58e787976436b5b3e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ae71f3ab47c57b6a3af58e7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 29 13:12:33 2014 +0200 Assorted spelling/grammar fixes. --- dlls/d3dx9_36/surface.c | 6 +++--- dlls/msvfw32/msvideo_main.c | 2 +- dlls/urlmon/sec_mgr.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/ws2_32/socket.c | 2 +- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 4 ++-- tools/c2man.pl | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 09c2fce..ad38444 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1030,7 +1030,7 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resour * * RETURNS * Success: D3D_OK - * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcData or SrcDataSize are NULL + * Failure: D3DERR_INVALIDCALL, if pDestSurface, pSrcData or SrcDataSize is NULL * D3DXERR_INVALIDDATA, if pSrcData is no valid image file * */ @@ -1720,7 +1720,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic * RETURNS * Success: D3D_OK, if we successfully load the pixel data into our surface or * if pSrcMemory is NULL but the other parameters are valid - * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect are NULL or + * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect is NULL or * if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) or * if DestRect is invalid * D3DXERR_INVALIDDATA, if we fail to lock pDestSurface @@ -1871,7 +1871,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, * * RETURNS * Success: D3D_OK - * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface are NULL + * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface is NULL * D3DXERR_INVALIDDATA, if one of the surfaces is not lockable * */ diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index ea38e0f..b6b7507 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -67,7 +67,7 @@ struct _reg_driver static reg_driver* reg_driver_list = NULL; -/* This one is a macro such that it works for both ASCII and Unicode */ +/* This one is a macro in order to work for both ASCII and Unicode */ #define fourcc_to_string(str, fcc) do { \ (str)[0] = LOBYTE(LOWORD(fcc)); \ (str)[1] = HIBYTE(LOWORD(fcc)); \ diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index dc57c88..5c145ae 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -2077,7 +2077,7 @@ HRESULT WINAPI CompareSecurityIds(BYTE *secid1, DWORD size1, BYTE *secid2, DWORD /******************************************************************** * IsInternetESCEnabledLocal (URLMON.108) * - * Undocumented, returns if IE is running in Enhanced Security Configuration. + * Undocumented, returns TRUE if IE is running in Enhanced Security Configuration. */ BOOL WINAPI IsInternetESCEnabledLocal(void) { diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index f142ffb..737d1bb 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4583,7 +4583,7 @@ typedef struct _invalid_uri { static const invalid_uri invalid_uri_tests[] = { /* Has to have a scheme name. */ {"://www.winehq.org",0,FALSE}, - /* Window's doesn't like URI's which are implicitly file paths without the + /* Windows doesn't like URIs which are implicitly file paths without the * ALLOW_IMPLICIT_FILE_SCHEME flag set. */ {"C:/test/test.mp3",0,FALSE}, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 229d04c..faefd71 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -99,7 +99,7 @@ typedef struct _tagAFM { const AFMMETRICS *Metrics; } AFM; -/* Note no 'next' in AFM. Use AFMLISTENTRY as a container. This allow more than +/* Note no 'next' in AFM. Use AFMLISTENTRY as a container. This allows more than one list to exist without having to reallocate the entire AFM structure. We keep a global list of all afms (PSDRV_AFMFontList) plus a list of available fonts for each DC (dc->physDev->Fonts) */ diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 10857dc..e1d0ce5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4758,7 +4758,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, switch(optname) { /* Some options need some conversion before they can be sent to - * setsockopt. The conversions are done here, then they will fall though + * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to * setsockopt follow below that.*/ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 53229a7..4c95b43 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -874,7 +874,7 @@ void WCMD_copy(WCHAR * args) { if (thiscopy->binarycopy == -1) thiscopy->binarycopy = !anyconcats; /* Convert to fully qualified path/filename in srcpath, file filenamepart pointing - to where the filename portion begins (used for wildcart expansion. */ + to where the filename portion begins (used for wildcard expansion). */ GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); WINE_TRACE("Full src name is '%s'\n", wine_dbgstr_w(srcpath)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 647f988..c475ad2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1605,8 +1605,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, case WCMD_FOR: case WCMD_IF: /* Very oddly, probably because of all the special parsing required for - these two commands, neither for nor if are supported when called, - ie call if 1==1... will fail. */ + these two commands, neither 'for' nor 'if' is supported when called, + i.e. 'call if 1==1...' will fail. */ if (!retrycall) { if (i==WCMD_FOR) WCMD_for (p, cmdList); else if (i==WCMD_IF) WCMD_if (p, cmdList); diff --git a/tools/c2man.pl b/tools/c2man.pl index 029f460..fba17ab 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -521,7 +521,7 @@ sub process_comment_text($) s/\[I\]|\[i\]|\[in\]|\[IN\]/\[In\] /g; s/\[O\]|\[o\]|\[out\]|\[OUT\]/\[Out\]/g; s/\[I\/O\]|\[I\,O\]|\[i\/o\]|\[in\/out\]|\[IN\/OUT\]/\[In\/Out\]/g; - # TRUE/FALSE/NULL are defines, capitilise them + # TRUE/FALSE/NULL are defines, capitalise them s/True|true/TRUE/g; s/False|false/FALSE/g; s/Null|null/NULL/g;

1 0