April 2009 - Wine-commits - list.winehq.org

Tag wine-1.1.20 : Alexandre Julliard : Release 1.1.20
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: refs/tags/wine-1.1.20 Tag: 65ff4a8dbd713b5bae66b44fc3bf040acb78c721 URL: http://source.winehq.org/git/wine.git/?a=tag;h=65ff4a8dbd713b5bae66b44fc3bf… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 18:52:05 2009 +0200 Release 1.1.20

1 0

André Hentschel : winemaker: Canonicalize directory name if used as target name.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 6a5be43650153c9fc1d9aacf7ce41945f5213d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5be43650153c9fc1d9aacf7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 23 20:41:32 2009 +0200 winemaker: Canonicalize directory name if used as target name. --- tools/winemaker | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index f3a31ce..eca6417 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1333,9 +1333,9 @@ sub source_scan_directory($$$$) } $name =~ s+(/|\.[^.]*)$++; if ($opt_target_type == $TT_DLL) { - $name = "$name.dll"; + $name = canonize($name).".dll"; } else { - $name = "$name.exe"; + $name = canonize($name).".exe"; } $targets{$name}=1; }

1 0

Hans Leidekker : wininet: Fix parsing of cookies with attributes.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: fbc99515eb905094dd5d4d0f48eda0ecb752b4c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc99515eb905094dd5d4d0f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:59:08 2009 +0200 wininet: Fix parsing of cookies with attributes. --- dlls/wininet/cookie.c | 26 +++++++++++++++++++++----- dlls/wininet/tests/internet.c | 9 +++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index fdccd65..dc77b17 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -447,12 +447,12 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST cookie_domain *thisCookieDomain = NULL; cookie *thisCookie; struct list *cursor; - LPWSTR data; + LPWSTR data, value; WCHAR *ptr; FILETIME expiry; BOOL expired = FALSE; - data = HeapAlloc(GetProcessHeap(),0,(lstrlenW(cookie_data)+1) * sizeof(WCHAR)); + value = data = HeapAlloc(GetProcessHeap(), 0, (strlenW(cookie_data) + 1) * sizeof(WCHAR)); strcpyW(data,cookie_data); memset(&expiry,0,sizeof(expiry)); @@ -469,6 +469,10 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST if (!(ptr = strchrW(ptr,';'))) break; *ptr++ = 0; + + value = HeapAlloc(GetProcessHeap(), 0, (ptr - data) * sizeof(WCHAR)); + strcpyW(value, data); + while (*ptr == ' ') ptr++; /* whitespace */ if (strncmpiW(ptr, szDomain, 7) == 0) @@ -502,11 +506,20 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST } } else if (strncmpiW(ptr, szSecure, 6) == 0) + { FIXME("secure not handled (%s)\n",debugstr_w(ptr)); + ptr += strlenW(szSecure); + } else if (strncmpiW(ptr, szHttpOnly, 8) == 0) + { FIXME("httponly not handled (%s)\n",debugstr_w(ptr)); - else + ptr += strlenW(szHttpOnly); + } + else if (*ptr) + { FIXME("Unknown additional option %s\n",debugstr_w(ptr)); + break; + } } LIST_FOR_EACH(cursor, &domain_list) @@ -524,6 +537,7 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST else { HeapFree(GetProcessHeap(),0,data); + if (value != data) HeapFree(GetProcessHeap(), 0, value); return TRUE; } } @@ -532,15 +546,17 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST COOKIE_deleteCookie(thisCookie, FALSE); TRACE("setting cookie %s=%s for domain %s path %s\n", debugstr_w(cookie_name), - debugstr_w(data), debugstr_w(thisCookieDomain->lpCookieDomain),debugstr_w(thisCookieDomain->lpCookiePath)); + debugstr_w(value), debugstr_w(thisCookieDomain->lpCookieDomain),debugstr_w(thisCookieDomain->lpCookiePath)); - if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name,data, expiry)) + if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name, value, expiry)) { HeapFree(GetProcessHeap(),0,data); + if (value != data) HeapFree(GetProcessHeap(), 0, value); return FALSE; } HeapFree(GetProcessHeap(),0,data); + if (value != data) HeapFree(GetProcessHeap(), 0, value); return TRUE; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 0ec7242..3c1b3da 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -272,6 +272,8 @@ static void test_complicated_cookie(void) ok(ret == TRUE,"InternetSetCookie failed\n"); ret = InternetSetCookie("http://www.example.com/bar/",NULL,"M=N; domain=.example.com; path=/foo/"); ok(ret == TRUE,"InternetSetCookie failed\n"); + ret = InternetSetCookie("http://www.example.com/bar/",NULL,"O=P; secure; path=/bar"); + ok(ret == TRUE,"InternetSetCookie failed\n"); len = 1024; ret = InternetGetCookie("http://testing.example.com", NULL, buffer, &len); @@ -282,6 +284,7 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"I=J")!=NULL,"I=J missing\n"); ok(strstr(buffer,"K=L")==NULL,"K=L present\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); + ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); len = 1024; ret = InternetGetCookie("http://testing.example.com/foobar", NULL, buffer, &len); @@ -292,6 +295,7 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"I=J")!=NULL,"I=J missing\n"); ok(strstr(buffer,"K=L")==NULL,"K=L present\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); + ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); len = 1024; ret = InternetGetCookie("http://testing.example.com/foobar/", NULL, buffer, &len); @@ -302,6 +306,7 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"I=J")!=NULL,"I=J missing\n"); ok(strstr(buffer,"K=L")==NULL,"K=L present\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); + ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); len = 1024; ret = InternetGetCookie("http://testing.example.com/foo/bar", NULL, buffer, &len); @@ -312,6 +317,7 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"I=J")!=NULL,"I=J missing\n"); ok(strstr(buffer,"K=L")==NULL,"K=L present\n"); ok(strstr(buffer,"M=N")!=NULL,"M=N missing\n"); + ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); len = 1024; ret = InternetGetCookie("http://testing.example.com/barfoo", NULL, buffer, &len); @@ -322,6 +328,7 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"I=J")!=NULL,"I=J missing\n"); ok(strstr(buffer,"K=L")==NULL,"K=L present\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); + ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); len = 1024; ret = InternetGetCookie("http://testing.example.com/barfoo/", NULL, buffer, &len); @@ -332,6 +339,7 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"I=J")!=NULL,"I=J missing\n"); ok(strstr(buffer,"K=L")==NULL,"K=L present\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); + ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); len = 1024; ret = InternetGetCookie("http://testing.example.com/bar/foo", NULL, buffer, &len); @@ -342,6 +350,7 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"I=J")!=NULL,"I=J missing\n"); ok(strstr(buffer,"K=L")!=NULL,"K=L missing\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); + ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); } static void test_null(void)

1 0

Hans Leidekker : wininet: Replace any existing cookie header.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 8ab00329dd90994da581b39c0de1c8c434a6cde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab00329dd90994da581b39c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 15:00:05 2009 +0200 wininet: Replace any existing cookie header. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8d03b61..3bda535 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3227,7 +3227,7 @@ static void HTTP_InsertCookies(LPWININETHTTPREQW lpwhr) InternetGetCookieW(lpszUrl, NULL, lpszCookies + cnt, &nCookieSize); strcatW(lpszCookies, szCrLf); - HTTP_HttpAddRequestHeadersW(lpwhr, lpszCookies, strlenW(lpszCookies), HTTP_ADDREQ_FLAG_ADD); + HTTP_HttpAddRequestHeadersW(lpwhr, lpszCookies, strlenW(lpszCookies), HTTP_ADDREQ_FLAG_REPLACE); HeapFree(GetProcessHeap(), 0, lpszCookies); } } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 773b4c6..bb701b0 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1885,6 +1885,15 @@ static void test_cookie_header(int port) ok(!ret, "HttpQueryInfo succeeded\n"); ok(error == ERROR_HTTP_HEADER_NOT_FOUND, "got %u expected ERROR_HTTP_HEADER_NOT_FOUND\n", error); + ret = HttpAddRequestHeaders(req, "Cookie: cookie=not biscuit\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed: %u\n", GetLastError()); + + buffer[0] = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); + ok(!strcmp(buffer, "cookie=not biscuit"), "got '%s' expected \'cookie=not biscuit\'\n", buffer); + ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed: %u\n", GetLastError());

1 0

Huw Davies : ole32/tests: Improve the traces in the test.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: d2837cb94dd36419241af174950f8d30388e3c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2837cb94dd36419241af1749… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 24 12:33:25 2009 +0100 ole32/tests: Improve the traces in the test. --- dlls/ole32/tests/clipboard.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index a4f9307..2b5c711 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -118,6 +118,8 @@ static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, EnumFormatImpl *This = (EnumFormatImpl*)iface; ULONG count, i; + trace("next: count %d cur %d\n", celt, This->cur); + if(!rgelt) return E_INVALIDARG; @@ -565,7 +567,7 @@ static void test_enum_fmtetc(IDataObject *src) ok(src != NULL, "shouldn't be here\n"); hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); ok(hr == S_OK, "%d: got %08x\n", count, hr); - trace("%d: cf %04x aspect %x tymed %x\n", count, fmt.cfFormat, fmt.dwAspect, fmt.tymed); + trace("%d: %s\n", count, dump_fmtetc(&fmt)); ok(fmt.cfFormat == src_fmt.cfFormat, "%d: %04x %04x\n", count, fmt.cfFormat, src_fmt.cfFormat); ok(fmt.dwAspect == src_fmt.dwAspect, "%d: %08x %08x\n", count, fmt.dwAspect, src_fmt.dwAspect); ok(fmt.lindex == src_fmt.lindex, "%d: %08x %08x\n", count, fmt.lindex, src_fmt.lindex);

1 0

Paul Vriens : shell32/tests: Fix some test failures on Win9x and NT4.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: cfd32a511936d19da4a8270ed5e3a8e2dc002793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd32a511936d19da4a8270ed… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 24 09:07:23 2009 +0200 shell32/tests: Fix some test failures on Win9x and NT4. --- dlls/shell32/tests/shlfolder.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 6a32ccf..3720340 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -263,13 +263,17 @@ static void test_EnumObjects(IShellFolder *iFolder) hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == (attrs[i]), "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(flags == (attrs[i]) || + flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */ + "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); flags = SFGAO_testfor; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == attrs[i], "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(flags == attrs[i] || + flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */ + "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); } for (i=0;i<5;i++)

1 0

Paul Vriens : shell32/tests: Fix a test failure on Win98.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 6d1d5b653f33b9e99a36341de3f0802ecb82f114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1d5b653f33b9e99a36341de… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 24 09:29:12 2009 +0200 shell32/tests: Fix a test failure on Win98. --- dlls/shell32/tests/shlfolder.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3720340..0536d2e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -147,8 +147,10 @@ static void test_ParseDisplayName(void) ok(SUCCEEDED(hr), "DesktopFolder->ParseDisplayName failed. hr = %08x.\n", hr); if (FAILED(hr)) goto finished; - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31, "Last pidl should be of type " - "PT_FOLDER, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31 || + pILFindLastID(newPIDL)->mkid.abID[0] == 0xb1, /* Win98 */ + "Last pidl should be of type PT_FOLDER or PT_IESPECIAL2, but is: %02x\n", + pILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); finished:

1 0

Paul Vriens : setupapi/tests: Fix a test failure on Win98.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 97505798ec1c9154835f529c47a3e66ef2f96525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97505798ec1c9154835f529c4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 24 11:56:10 2009 +0200 setupapi/tests: Fix a test failure on Win98. --- dlls/setupapi/tests/misc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 726d1eb..e110e22 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -144,7 +144,7 @@ static void test_SetupCopyOEMInf(void) CHAR toolong[MAX_PATH * 2]; CHAR path[MAX_PATH], dest[MAX_PATH]; CHAR tmpfile[MAX_PATH], dest_save[MAX_PATH]; - LPSTR inf; + LPSTR inf = NULL; DWORD size; BOOL res; @@ -293,6 +293,9 @@ static void test_SetupCopyOEMInf(void) ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size); ok(file_exists(dest), "Expected destination inf to exist\n"); + ok((inf && inf[0] != 0) || + broken(!inf), /* Win98 */ + "Expected inf to point to the filename\n"); ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); ok(file_exists(path), "Expected source inf to exist\n"); ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n");

1 0

Paul Vriens : gdiplus/tests: Fix a test failure on Win98.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 1c2b29dae3967fbd21f28e56eea7aacf84329b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2b29dae3967fbd21f28e56e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 24 14:43:48 2009 +0200 gdiplus/tests: Fix a test failure on Win98. --- dlls/gdiplus/tests/image.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5d46c8b..4c836cd 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -629,7 +629,9 @@ static void test_fromhicon(void) DeleteObject(hbmColor); stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); - expect(Ok, stat); + ok(stat == Ok || + broken(stat == InvalidParameter), /* Win98 */ + "Expected Ok, got %.8x\n", stat); if(stat == Ok){ /* check attributes */ stat = GdipGetImageHeight((GpImage*)bitmap, &dim);

1 0

Konstantin Kondratyuk : fonts: Add Kazakhstan's symbols into tahoma.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 3ae2e3a76281622f1562de70b8144b603aad1ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae2e3a76281622f1562de70b… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Apr 24 15:10:32 2009 +0400 fonts: Add Kazakhstan's symbols into tahoma. --- fonts/tahoma.sfd | 643 +++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/tahoma.ttf | Bin 85796 -> 89124 bytes 2 files changed, 637 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ae2e3a76281622f1562d…

1 0