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

Thomas Faber : d3dx9_36: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 5bd5c89596f66bb13a0f2ceb4be41dd24b438d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd5c89596f66bb13a0f2ceb4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:32:44 2014 +0200 d3dx9_36: Do not omit mandatory argument to WriteFile. --- dlls/d3dx9_36/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 3b3f308..94899cf 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -181,6 +181,7 @@ HRESULT write_buffer_to_file(const WCHAR *dst_filename, ID3DXBuffer *buffer) HRESULT hr = S_OK; void *buffer_pointer; DWORD buffer_size; + DWORD bytes_written; HANDLE file = CreateFileW(dst_filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (file == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); @@ -188,7 +189,7 @@ HRESULT write_buffer_to_file(const WCHAR *dst_filename, ID3DXBuffer *buffer) buffer_pointer = ID3DXBuffer_GetBufferPointer(buffer); buffer_size = ID3DXBuffer_GetBufferSize(buffer); - if (!WriteFile(file, buffer_pointer, buffer_size, NULL, NULL)) + if (!WriteFile(file, buffer_pointer, buffer_size, &bytes_written, NULL)) hr = HRESULT_FROM_WIN32(GetLastError()); CloseHandle(file);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.22
by Jeremy Newman 14 Jul '14

14 Jul '14

Module: website Branch: master Commit: a18208d21a2b8266fe71d396965273b3c074f602 URL: http://source.winehq.org/git/website.git/?a=commit;h=a18208d21a2b8266fe71d3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jul 12 06:28:09 2014 +0200 Polish translation for release 1.7.22 --- news/pl/2014071101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014071101.xml b/news/pl/2014071101.xml new file mode 100644 index 0000000..8c1ca3e --- /dev/null +++ b/news/pl/2014071101.xml @@ -0,0 +1,16 @@ +<news> +<date>Lipiec 11, 2014</date> +<title>Wydano Wine 1.7.22</title> +<body> + Wydanie rozwojowe Wine 1.7.22 jest już dostępne. + <a href="{$root}/announce/1.7.22">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa par znaków Unicode służących do wtrąceń w zdaniach.</li> + <li>Ulepszona obsługa ciasteczek internetowych.</li> + <li>Sterownik CoreAudio dla OS X używa AUHAL zamiast AudioQueue.</li> + <li>Wstępna obsługa informacji geograficznych.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.22
by Jeremy Newman 14 Jul '14

14 Jul '14

Module: website Branch: master Commit: e25c954b5ecd51a18e38689c38d102eccbf0a680 URL: http://source.winehq.org/git/website.git/?a=commit;h=e25c954b5ecd51a18e3868… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 12 09:57:20 2014 +0200 French translation for release 1.7.22 --- news/fr/2014071101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014071101.xml b/news/fr/2014071101.xml new file mode 100644 index 0000000..c3b315b --- /dev/null +++ b/news/fr/2014071101.xml @@ -0,0 +1,15 @@ +<news> +<date>11 juillet 2014</date> +<title>Sortie de Wine 1.7.22</title> +<body> + La version de développement 1.7.22 de Wine est disponible. + <a href="{$root}/announce/1.7.22">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des paires de crochets Unicode.</li> + <li>Meilleure prise en charge des cookies Internet.</li> + <li>Le pilote OS X CoreAudio utilise AUHAL au lieu de AudioQueue.</li> + <li>Prise en charge initiale des informations géographiques.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.22
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: website Branch: master Commit: 85d7538ee80caa1c36a4dfaba37bb786eb5402c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=85d7538ee80caa1c36a4df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:37:42 2014 +0200 Wine release 1.7.22 --- news/en/2014071101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014071101.xml b/news/en/2014071101.xml new file mode 100644 index 0000000..972fc75 --- /dev/null +++ b/news/en/2014071101.xml @@ -0,0 +1,16 @@ +<news> +<date>July 11, 2014</date> +<title>Wine 1.7.22 Released</title> +<body> + The Wine development release 1.7.22 is now available. + <a href="{$root}/announce/1.7.22">What's new</a> in this release: +<ul> + <li>Support for Unicode bracketing pairs.</li> + <li>Improved Internet cookie support.</li> + <li>OS X CoreAudio driver uses AUHAL instead of AudioQueue.</li> + <li>Initial support for geographical information.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : kernel32: Partially implement GetGeoInfo().
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: master Commit: b4acc62e6304b1a13cca26df19da82065abcc4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4acc62e6304b1a13cca26df1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 11 06:36:18 2014 +0400 kernel32: Partially implement GetGeoInfo(). --- dlls/kernel32/locale.c | 464 ++++++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/locale.c | 111 +++++++++-- include/winnls.h | 4 +- 3 files changed, 553 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4acc62e6304b1a13cca2…

1 0

Qian Hong : gdiplus: Set outer pointer to NULL when image loading functions fail.
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: master Commit: deb1f047a7dc1c3bc84ab4a0b6588d7b32a261c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb1f047a7dc1c3bc84ab4a0b… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jul 11 15:55:53 2014 +0800 gdiplus: Set outer pointer to NULL when image loading functions fail. --- dlls/gdiplus/image.c | 4 ++++ dlls/gdiplus/tests/image.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 20098ca..7964cd8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1387,6 +1387,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, if(!filename || !bitmap) return InvalidParameter; + *bitmap = NULL; + stat = GdipCreateStreamOnFile(filename, GENERIC_READ, &stream); if(stat != Ok) @@ -2945,6 +2947,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, if (!filename || !image) return InvalidParameter; + *image = NULL; + stat = GdipCreateStreamOnFile(filename, GENERIC_READ, &stream); if (stat != Ok) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index db0bc6a..b88238b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -374,24 +374,48 @@ static void test_GdipImageGetFrameDimensionsCount(void) static void test_LoadingImages(void) { GpStatus stat; + GpBitmap *bm; + GpImage *img; + static const WCHAR nonexistentW[] = {'n','o','n','e','x','i','s','t','e','n','t',0}; stat = GdipCreateBitmapFromFile(0, 0); expect(InvalidParameter, stat); - stat = GdipCreateBitmapFromFile(0, (GpBitmap**)0xdeadbeef); + bm = (GpBitmap *)0xdeadbeef; + stat = GdipCreateBitmapFromFile(0, &bm); expect(InvalidParameter, stat); + ok(bm == (GpBitmap *)0xdeadbeef, "returned %p\n", bm); + + bm = (GpBitmap *)0xdeadbeef; + stat = GdipCreateBitmapFromFile(nonexistentW, &bm); + todo_wine expect(InvalidParameter, stat); + ok(!bm, "returned %p\n", bm); stat = GdipLoadImageFromFile(0, 0); expect(InvalidParameter, stat); - stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef); + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFile(0, &img); expect(InvalidParameter, stat); + ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); + + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFile(nonexistentW, &img); + todo_wine expect(OutOfMemory, stat); + ok(!img, "returned %p\n", img); stat = GdipLoadImageFromFileICM(0, 0); expect(InvalidParameter, stat); - stat = GdipLoadImageFromFileICM(0, (GpImage**)0xdeadbeef); + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFileICM(0, &img); expect(InvalidParameter, stat); + ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); + + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFileICM(nonexistentW, &img); + todo_wine expect(OutOfMemory, stat); + ok(!img, "returned %p\n", img); } static void test_SavingImages(void)

1 0

Jacek Caban : wininet: Don' t allow overriding httponly cookies with non-httponly ones.
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: master Commit: f72975d811a7622f32d66315276a9c8857f20090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f72975d811a7622f32d663152… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 11 12:20:31 2014 +0200 wininet: Don't allow overriding httponly cookies with non-httponly ones. --- dlls/wininet/cookie.c | 8 ++++++++ dlls/wininet/tests/internet.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 0af8c38..8bf8953 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -963,6 +963,14 @@ DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_nam if ((thisCookie = COOKIE_findCookie(thisCookieDomain, cookie_name))) { + if ((thisCookie->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) { + WARN("An attempt to override httponly cookie\n"); + SetLastError(ERROR_INVALID_OPERATION); + heap_free(data); + if (value != data) heap_free(value); + return COOKIE_STATE_REJECT; + } + if (!(thisCookie->flags & INTERNET_COOKIE_IS_SESSION)) update_persistent = TRUE; COOKIE_deleteCookie(thisCookie, FALSE); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 17e16ab..688f786 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -595,6 +595,21 @@ static void test_cookie_attrs(void) ret = InternetGetCookieExA("http://cookie.attrs.com/", NULL, buf, &size, INTERNET_COOKIE_HTTPONLY, NULL); ok(ret, "InternetGetCookieEx failed: %u\n", GetLastError()); ok(!strcmp(buf, "A=data"), "data = %s\n", buf); + + /* Try to override httponly cookie with non-httponly one */ + ret = InternetSetCookieA("http://cookie.attrs.com/bar", NULL, "A=test"); + ok(!ret && GetLastError() == ERROR_INVALID_OPERATION, "InternetSetCookie returned: %x (%u)\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + state = InternetSetCookieExA("http://cookie.attrs.com/bar", NULL, "A=data", 0, 0); + ok(state == COOKIE_STATE_REJECT && GetLastError() == ERROR_INVALID_OPERATION, + "InternetSetCookieEx returned: %x (%u)\n", ret, GetLastError()); + + size = sizeof(buf); + ret = InternetGetCookieExA("http://cookie.attrs.com/", NULL, buf, &size, INTERNET_COOKIE_HTTPONLY, NULL); + ok(ret, "InternetGetCookieEx failed: %u\n", GetLastError()); + ok(!strcmp(buf, "A=data"), "data = %s\n", buf); + } static void test_cookie_url(void)

1 0

Piotr Caban : urlmon: Recognize <body> tag in FindMimeFromData function.
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: master Commit: df8a1ce6097b9ecff38ad4caec8900a4f0870f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8a1ce6097b9ecff38ad4cae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 11 16:23:08 2014 +0200 urlmon: Recognize <body> tag in FindMimeFromData function. --- dlls/urlmon/mimefilter.c | 7 ++++++- dlls/urlmon/tests/misc.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index 4f47a04..55cd200 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -280,7 +280,12 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) && (b[1] == 'h' || b[1] == 'H') && (b[2] == 'e' || b[2] == 'E') && (b[3] == 'a' || b[3] == 'A') - && (b[4] == 'd' || b[4] == 'D'))) return TRUE; + && (b[4] == 'd' || b[4] == 'D')) + || (b[0] == '<' + && (b[1] == 'b' || b[1] == 'B') + && (b[2] == 'o' || b[2] == 'O') + && (b[3] == 'd' || b[3] == 'D') + && (b[4] == 'y' || b[4] == 'Y'))) return TRUE; return FALSE; } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 7071aa9..4c845aa 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -575,6 +575,8 @@ static BYTE data93[] = {'<','?','x','m','l',' ',' ','<','h','t','m','l','>'}; static BYTE data94[] = {'<','h','t','m','l','>','<','?','x','m','l',' ',' '}; static BYTE data95[] = {'{','\\','r','t','f','<','?','x','m','l',' ',' '}; static BYTE data96[] = {'<','?','x','m','l',' '}; +static BYTE data97[] = "<body"; +static BYTE data98[] = "blah<BoDyblahblah"; static const struct { BYTE *data; @@ -681,6 +683,8 @@ static const struct { {data94, sizeof(data94), "text/html", "text/plain"}, {data95, sizeof(data95), "text/xml", "text/richtext"}, {data96, sizeof(data96), "text/plain"}, + {data97, sizeof(data97), "text/html", "text/plain"}, + {data98, sizeof(data98), "text/html", "text/plain"}, {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, {NULL, 0, "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"},

1 0

Vincent Povirk : winex11: Leave fullscreen state alone when minimizing.
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: master Commit: 5e5a9d6f937c69b1546a922205ba8daa40ebb1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5a9d6f937c69b1546a92220… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 10 15:29:29 2014 -0500 winex11: Leave fullscreen state alone when minimizing. --- dlls/winex11.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 77cf304..06e2294 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -974,6 +974,8 @@ void update_net_wm_states( struct x11drv_win_data *data ) if (data->whole_window == root_window) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (style & WS_MINIMIZE) + new_state |= data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN); if (is_window_rect_fullscreen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION)

1 0

Alexandre Julliard : Release 1.7.22.
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: master Commit: 307b7fe71879b718512dadc09fd4b533f6bdd151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307b7fe71879b718512dadc09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:29:24 2014 +0200 Release 1.7.22. --- ANNOUNCE | 528 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 233 insertions(+), 316 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=307b7fe71879b718512da…

1 0