March 2015 - Wine-Commits - list.winehq.org

Bruno Jesus : ws2_32/tests: Check the OOB mark in the right place.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: a19febc1a769a298d0c68b32a70921c5467ba7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19febc1a769a298d0c68b32a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 15 16:13:18 2015 -0300 ws2_32/tests: Check the OOB mark in the right place. --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c596e85..3a60ddb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -612,15 +612,15 @@ static VOID WINAPI oob_server ( server_params *par ) pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); ok ( pos == -1, "oob_server (%x): test pattern error: %d\n", id, pos); + /* check atmark state */ + ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); + ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); + /* Echo data back */ n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); - /* check atmark state */ - ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); - ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); - /* Receive a part of the out-of-band data and check atmark state */ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, 0, par->buflen ); ok ( n_recvd == 8,

1 0

Francois Gouget : krnl386.exe16: Fix the _lread16() documentation.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: a4e38fab7c0cfb2060adf6fc5fb32c37a9c8f418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e38fab7c0cfb2060adf6fc5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:10:36 2015 +0100 krnl386.exe16: Fix the _lread16() documentation. --- dlls/krnl386.exe16/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 1386fe1..1584340 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -394,7 +394,7 @@ HFILE16 WINAPI _lopen16( LPCSTR path, INT16 mode ) /*********************************************************************** - * _lread16 (KERNEL.82) + * _lread16 (internal) */ UINT16 WINAPI _lread16( HFILE16 hFile, LPVOID buffer, UINT16 count ) {

1 0

Francois Gouget : winex11.drv: Make X11DRV_XROPfunction static.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: c223994b7a78836a03623b92a156b569737f06dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c223994b7a78836a03623b92a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:04:52 2015 +0100 winex11.drv: Make X11DRV_XROPfunction static. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/x11drv.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 769fa8a..f23a502 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); #define ABS(x) ((x)<0?(-(x)):(x)) /* ROP code to GC function conversion */ -const int X11DRV_XROPfunction[16] = +static const int X11DRV_XROPfunction[16] = { GXclear, /* R2_BLACK */ GXnor, /* R2_NOTMERGEPEN */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 533af2c..da13c6e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -214,8 +214,6 @@ extern BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ) DECLSPEC_HIDDEN; extern INT X11DRV_XWStoDS( HDC hdc, INT width ) DECLSPEC_HIDDEN; extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; -extern const int X11DRV_XROPfunction[]; - extern BOOL client_side_graphics DECLSPEC_HIDDEN; extern BOOL client_side_with_render DECLSPEC_HIDDEN; extern BOOL shape_layered_windows DECLSPEC_HIDDEN;

1 0

Piotr Caban : gdiplus: Fixed palette flags setting.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 59eef10f345ec7162bca4c3e0bf8a436af7f2cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=59eef10f345ec7162bca4c3e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 13 15:14:37 2015 +0100 gdiplus: Fixed palette flags setting. --- dlls/gdiplus/image.c | 34 ++++++++++++++++++++++++---------- dlls/gdiplus/tests/image.c | 23 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4bce334..8eb1419 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -87,22 +87,36 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT } if (hr == S_OK) { + WICBitmapPaletteType type; + BOOL alpha; UINT count; - BOOL mono, gray; - - IWICPalette_IsBlackWhite(wic_palette, &mono); - IWICPalette_IsGrayscale(wic_palette, &gray); IWICPalette_GetColorCount(wic_palette, &count); palette = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(UINT) + count * sizeof(ARGB)); IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); - if (mono) - palette->Flags = 0; - else if (gray) - palette->Flags = PaletteFlagsGrayScale; - else - palette->Flags = PaletteFlagsHalftone; + IWICPalette_GetType(wic_palette, &type); + switch(type) { + case WICBitmapPaletteTypeFixedGray4: + case WICBitmapPaletteTypeFixedGray16: + case WICBitmapPaletteTypeFixedGray256: + palette->Flags = PaletteFlagsGrayScale; + break; + case WICBitmapPaletteTypeFixedHalftone8: + case WICBitmapPaletteTypeFixedHalftone27: + case WICBitmapPaletteTypeFixedHalftone64: + case WICBitmapPaletteTypeFixedHalftone125: + case WICBitmapPaletteTypeFixedHalftone216: + case WICBitmapPaletteTypeFixedHalftone252: + case WICBitmapPaletteTypeFixedHalftone256: + palette->Flags = PaletteFlagsHalftone; + break; + default: + palette->Flags = 0; + } + IWICPalette_HasAlpha(wic_palette, &alpha); + if(alpha) + palette->Flags |= PaletteFlagsHasAlpha; } IWICPalette_Release(wic_palette); } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 91f70b5..68a06c4 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2487,6 +2487,9 @@ static void test_multiframegif(void) GUID dimension; PixelFormat pixel_format; INT palette_size, i, j; + char palette_buf[256]; + ColorPalette *palette; + ARGB *palette_entries; /* Test frame functions with an animated GIF */ hglob = GlobalAlloc (0, sizeof(gifanimation)); @@ -2644,6 +2647,26 @@ static void test_multiframegif(void) expect(Ok, stat); expect(PixelFormat8bppIndexed, pixel_format); + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipGetImagePaletteSize((GpImage*)bmp, &palette_size); + expect(Ok, stat); + ok(palette_size == sizeof(ColorPalette)+sizeof(ARGB), + "palette_size = %d\n", palette_size); + + memset(palette_buf, 0xfe, sizeof(palette_buf)); + palette = (ColorPalette*)palette_buf; + stat = GdipGetImagePalette((GpImage*)bmp, palette, + sizeof(ColorPalette)+sizeof(ARGB)); + palette_entries = palette->Entries; + expect(Ok, stat); + expect(PaletteFlagsHasAlpha, palette->Flags); + expect(2, palette->Count); + expect(0, palette_entries[0]); + expect(0xff000000, palette_entries[1]); + count = 12345; stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); expect(Ok, stat);

1 0

Francois Gouget : msi: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 232d1b6e3ff0350c2a239ba65618232dce0f43ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=232d1b6e3ff0350c2a239ba65… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:06:53 2015 +0100 msi: Remove unneeded NONAMELESSXXX directives. --- dlls/msi/database.c | 1 - dlls/msi/dialog.c | 1 - dlls/msi/msi_main.c | 1 - dlls/msi/registry.c | 1 - dlls/msi/source.c | 1 - dlls/msi/table.c | 2 -- 6 files changed, 7 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index dd2c004..e970ef6 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -22,7 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4380879..6baf08d 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -21,7 +21,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 148e678..0955856 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3dc989f..2106ab2 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -22,7 +22,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 2b88ce3..f4c139f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e1f7d9b..256034b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -22,8 +22,6 @@ #include <assert.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Jactry Zeng : Update Simplified Chinese download page.
by Jeremy Newman March 16, 2015

March 16, 2015

Module: website Branch: master Commit: e1a59f1e1f0a6a4aaee9aeab78c5e05bc31a44d8 URL: http://source.winehq.org/git/website.git/?a=commit;h=e1a59f1e1f0a6a4aaee9ae… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Mar 16 08:56:52 2015 +0800 Update Simplified Chinese download page. --- templates/zh-cn/download.template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 8ac0172..d3d51ca 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -36,6 +36,8 @@ requested in exchange for hosting the Wine web site.</p> <h2 style="margin-bottom: 5px;"><a name="binary"></a> Wine 的二进制下载</h2> +<p>由发行版构建和维护的二进制可能包含不被 Wine 上游支持的补丁。以下链接只是为了方便用户而提供，不代表 Wine 上游的认可。</p> + <table style="margin: 0 0 15px 0;" width="100%"> <tr> <td width="200">最新的稳定版：</td><td>Wine {$config_stable_release}</td> @@ -61,7 +63,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux"border="0"></a> </td> <td> <b><a href="{$root}/download/ubuntu">下载 Ubuntu 安装包</a></b> - - Ubuntu Oneiric（11.10), Precise（12.04）和 Saucy（13.10）的二进制和源码 .debs + - Ubuntu Trusty (14.04 LTS) 的二进制和源码 .debs</td> <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> @@ -83,7 +85,7 @@ requested in exchange for hosting the Wine web site.</p> wine 的元包可以通过 <tt>yum</tt> 来安装，运行“<tt>$ yum install wine</tt>”从 EPEL / Fedora Extras / Fedora 的仓库获取。 </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> + <td><a href="mailto:andreas.bierfert(a)lowlatency.de">Andreas Bierfert</a></td> </tr> <tr bgcolor="#ffffff"> @@ -101,7 +103,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">下载 Slackware 安装包</a></b> - - 二进制 txz（Slackware 14.0），和 tgz （支持旧版本）</td> + - 二进制 txz（Slackware 14.1），和 tgz （支持旧版本）</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr>

1 0

André Hentschel : Add WWN 387
by Jeremy Newman March 16, 2015

March 16, 2015

Module: website Branch: master Commit: d7a9512c6e134ab0e034f73eb26a58ef246388a1 URL: http://source.winehq.org/git/website.git/?a=commit;h=d7a9512c6e134ab0e034f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 14 13:57:27 2015 +0100 Add WWN 387 --- news/de/2015031401.xml | 11 + news/en/2015031401.xml | 11 + wwn/en/wn20150314_387.xml | 538 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 560 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d7a9512c6e134ab0e0…

1 0

Nikolay Sivov : ole32: Handle Stat() failure in OleLoad() (PVS-Studio).
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 0e24c33332ce560033795cf831a2d87c41625a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e24c33332ce560033795cf83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:52:27 2015 +0300 ole32: Handle Stat() failure in OleLoad() (PVS-Studio). --- dlls/ole32/ole2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b9cc1f0..38b23dc 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1279,6 +1279,8 @@ HRESULT WINAPI OleLoad( * Get the class ID for the object. */ hres = IStorage_Stat(pStg, &storageInfo, STATFLAG_NONAME); + if (FAILED(hres)) + return hres; /* * Now, try and create the handler for the object

1 0

Stefan Dösinger : ddraw/tests: r200 ignores the alpha channel when matching color keys.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 5061e3502e17767556040699a68318e586c5d6d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5061e3502e17767556040699a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 12 10:55:19 2015 +0100 ddraw/tests: r200 ignores the alpha channel when matching color keys. --- dlls/ddraw/tests/ddraw1.c | 34 ++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw2.c | 34 ++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 34 ++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 34 ++++++++++++++++++++-------------- 4 files changed, 80 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5061e3502e17767556040…

1 0

Qian Hong : ws2_32: Improved error handling in gethostname when name length is insufficient.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: bed1525fa40ca4190500efc03d11a8f0c6ee4704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed1525fa40ca4190500efc03… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Mar 12 01:08:09 2015 +0800 ws2_32: Improved error handling in gethostname when name length is insufficient. --- dlls/ws2_32/socket.c | 31 +++++++++++++++++++++++++------ dlls/ws2_32/tests/sock.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a3b6b26..960556d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6056,16 +6056,35 @@ struct WS_servent* WINAPI WS_getservbyport(int port, const char *proto) */ int WINAPI WS_gethostname(char *name, int namelen) { + char buf[256]; + int len; + TRACE("name %p, len %d\n", name, namelen); - if (gethostname(name, namelen) == 0) + if (!name) { - TRACE("<- '%s'\n", name); - return 0; + SetLastError(WSAEFAULT); + return SOCKET_ERROR; } - SetLastError((errno == EINVAL) ? WSAEFAULT : wsaErrno()); - TRACE("<- ERROR !\n"); - return SOCKET_ERROR; + + if (gethostname(buf, sizeof(buf)) != 0) + { + SetLastError(wsaErrno()); + return SOCKET_ERROR; + } + + TRACE("<- '%s'\n", buf); + len = strlen(buf); + if (len > 15) + WARN("Windows supports NetBIOS name length up to 15 bytes!\n"); + if (namelen <= len) + { + SetLastError(WSAEFAULT); + WARN("<- not enough space for hostname, required %d, got %d!\n", len + 1, namelen); + return SOCKET_ERROR; + } + strcpy(name, buf); + return 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ec4b563..ca8e1a5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4215,6 +4215,39 @@ static void test_gethostbyname_hack(void) * resolve nonexistent host names to addresses of the ISP's spam pages. */ } +static void test_gethostname(void) +{ + struct hostent *he; + char name[256]; + int ret, len; + + WSASetLastError(0xdeadbeef); + ret = gethostname(NULL, 256); + ok(ret == -1, "gethostname() returned %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "gethostname with null buffer " + "failed with %d, expected %d\n", WSAGetLastError(), WSAEFAULT); + + ret = gethostname(name, sizeof(name)); + ok(ret == 0, "gethostname() call failed: %d\n", WSAGetLastError()); + he = gethostbyname(name); + ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, WSAGetLastError()); + + len = strlen(name); + WSASetLastError(0xdeadbeef); + strcpy(name, "deadbeef"); + ret = gethostname(name, len); + ok(ret == -1, "gethostname() returned %d\n", ret); + ok(!strcmp(name, "deadbeef"), "name changed unexpected!\n"); + ok(WSAGetLastError() == WSAEFAULT, "gethostname with insufficient length " + "failed with %d, expected %d\n", WSAGetLastError(), WSAEFAULT); + + len++; + ret = gethostname(name, len); + ok(ret == 0, "gethostname() call failed: %d\n", WSAGetLastError()); + he = gethostbyname(name); + ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, WSAGetLastError()); +} + static void test_inet_addr(void) { u_long addr; @@ -8437,6 +8470,7 @@ START_TEST( sock ) test_ioctlsocket(); test_dns(); test_gethostbyname_hack(); + test_gethostname(); test_WSASendMsg(); test_WSASendTo();

1 0