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

Bruno Jesus : ws2_32/tests: Check the OOB mark in the right place.
by Alexandre Julliard 16 Mar '15

16 Mar '15

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

Nikolay Sivov : dwrite: Actually return NULL names pointer and error code when failed to read them.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 5eccb1322d09362c5431911bcdc5a4d218ee98fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eccb1322d09362c5431911bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 21:24:49 2015 +0300 dwrite: Actually return NULL names pointer and error code when failed to read them. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 12ce3ca..32ed712 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -773,7 +773,7 @@ HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index { const void *name_table = NULL; void *name_context; - HRESULT hr = S_OK; + HRESULT hr = E_FAIL; opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); if (name_table) { @@ -781,7 +781,7 @@ HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); } else - names = NULL; + *names = NULL; return hr; }

1 0

Nikolay Sivov : dwrite: Fix invalid parameter handling in GetGlyphIndices( ).
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 2933e8666f77cf92d4458514d345abb9851a95f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2933e8666f77cf92d4458514d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 21:57:50 2015 +0300 dwrite: Fix invalid parameter handling in GetGlyphIndices(). --- dlls/dwrite/font.c | 8 ++++++++ dlls/dwrite/tests/font.c | 23 ++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 32ed712..c4b8818 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -392,6 +392,14 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace2 *iface, UI TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); + if (!glyph_indices) + return E_INVALIDARG; + + if (!codepoints) { + memset(glyph_indices, 0, count*sizeof(UINT16)); + return E_INVALIDARG; + } + for (i = 0; i < count; i++) glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i]); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d773c66..a9a6802 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1779,7 +1779,7 @@ static void test_CreateCustomFontFileReference(void) HRESULT hr; HRSRC fontrsrc; UINT32 codePoints[1] = {0xa8}; - UINT16 indices[1]; + UINT16 indices[2]; factory = create_factory(); factory2 = create_factory(); @@ -1876,6 +1876,27 @@ if (face2) IDWriteFontFace_Release(face2); IDWriteFontFile_Release(file2); + hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 0, NULL); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 0, NULL); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 0, indices); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 0, indices); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); + + indices[0] = indices[1] = 11; + hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 1, indices); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(indices[0] == 0, "got index %i\n", indices[0]); + ok(indices[1] == 11, "got index %i\n", indices[1]); + +if (0) /* crashes on native */ + hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 1, NULL); + hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 1, indices); ok(hr == S_OK, "got 0x%08x\n", hr); ok(indices[0] == 6, "got index %i\n", indices[0]);

1 0

Nikolay Sivov : dwrite: Implement HasKerningPairs().
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 23c2ef2fcde3aef1ecc3021a3440c47db0007d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c2ef2fcde3aef1ecc3021a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 22:42:30 2015 +0300 dwrite: Implement HasKerningPairs(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 ++-- dlls/dwrite/freetype.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9481c74..92f0427 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -162,6 +162,7 @@ extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN; +extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c4b8818..66dbc68 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -669,8 +669,8 @@ static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 static BOOL WINAPI dwritefontface1_HasKerningPairs(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return freetype_has_kerning_pairs(iface); } static HRESULT WINAPI dwritefontface1_GetRecommendedRenderingMode(IDWriteFontFace2 *iface, diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 84c9cad..325f156 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -407,6 +407,19 @@ UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) return glyph; } +BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) +{ + BOOL has_kerning_pairs = FALSE; + FT_Face face; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) + has_kerning_pairs = FT_HAS_KERNING(face); + LeaveCriticalSection(&freetype_cs); + + return has_kerning_pairs; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -448,4 +461,9 @@ UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) return 0; } +BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) +{ + return FALSE; +} + #endif /* HAVE_FREETYPE */

1 0

Nikolay Sivov : dwrite: Implement GetKerningPairAdjustments().
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 7e480d3c6d475617e66a21711daffd02d8fef0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e480d3c6d475617e66a21711… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 23:19:18 2015 +0300 dwrite: Implement GetKerningPairAdjustments(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 21 +++++++++++++++++--- dlls/dwrite/freetype.c | 25 ++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 92f0427..aa73b4b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -163,6 +163,7 @@ extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT, extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN; extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN; +extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2*,UINT16,UINT16) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 66dbc68..59eda80 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -658,12 +658,27 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF return E_NOTIMPL; } -static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 *iface, UINT32 glyph_count, +static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 *iface, UINT32 count, const UINT16 *indices, INT32 *adjustments) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, glyph_count, indices, adjustments); - return E_NOTIMPL; + UINT32 i; + + TRACE("(%p)->(%u %p %p)\n", This, count, indices, adjustments); + + if (!(indices || adjustments) || !count) + return E_INVALIDARG; + + if (!indices || count == 1) { + memset(adjustments, 0, count*sizeof(INT32)); + return E_INVALIDARG; + } + + for (i = 0; i < count-1; i++) + adjustments[i] = freetype_get_kerning_pair_adjustment(iface, indices[i], indices[i+1]); + adjustments[count-1] = 0; + + return S_OK; } static BOOL WINAPI dwritefontface1_HasKerningPairs(IDWriteFontFace2 *iface) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 325f156..a18c542 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -63,6 +63,7 @@ typedef struct #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Done_FreeType); +MAKE_FUNCPTR(FT_Get_Kerning); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Library_Version); MAKE_FUNCPTR(FT_Load_Glyph); @@ -135,6 +136,7 @@ BOOL init_freetype(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(FT_Done_FreeType) + LOAD_FUNCPTR(FT_Get_Kerning) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Library_Version) LOAD_FUNCPTR(FT_Load_Glyph) @@ -420,6 +422,24 @@ BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) return has_kerning_pairs; } +INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2 *fontface, UINT16 left, UINT16 right) +{ + INT32 adjustment = 0; + FT_Face face; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) { + FT_Vector kern; + if (FT_HAS_KERNING(face)) { + pFT_Get_Kerning(face, left, right, FT_KERNING_UNSCALED, &kern); + adjustment = kern.x; + } + } + LeaveCriticalSection(&freetype_cs); + + return adjustment; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -466,4 +486,9 @@ BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) return FALSE; } +INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2 *fontface, UINT16 left, UINT16 right) +{ + return 0; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a9a6802..9762d49 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3136,6 +3136,51 @@ static void test_GetGlyphCount(void) DELETE_FONTFILE(path); } +static void test_GetKerningPairAdjustments(void) +{ + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFontFile *file; + WCHAR *path; + HRESULT hr; + + path = create_testfontfile(test_fontfile); + factory = create_factory(); + + hr = IDWriteFactory_CreateFontFileReference(factory, path, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (hr == S_OK) { + INT32 adjustments[1]; + + hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 0, NULL, NULL); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); + + if (0) /* crashes on native */ + hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, NULL); + + adjustments[0] = 1; + hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, adjustments); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(adjustments[0] == 0, "got %d\n", adjustments[0]); + + IDWriteFontFace1_Release(fontface1); + } + else + win_skip("GetKerningPairAdjustments() is not supported.\n"); + + IDWriteFontFace_Release(fontface); + IDWriteFactory_Release(factory); + DELETE_FONTFILE(path); +} + + START_TEST(font) { IDWriteFactory *factory; @@ -3176,6 +3221,7 @@ START_TEST(font) test_GetEudcFontCollection(); test_GetCaretMetrics(); test_GetGlyphCount(); + test_GetKerningPairAdjustments(); IDWriteFactory_Release(factory); }

1 0

Jactry Zeng : Update Simplified Chinese download page.
by Jeremy Newman 16 Mar '15

16 Mar '15

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 16 Mar '15

16 Mar '15

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

Stefan Dösinger : d3d8/tests: oFog is not initialized on r200.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: b003cefe9e9d7cd397817224c45c1bc2e799b130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b003cefe9e9d7cd397817224c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 12 10:55:18 2015 +0100 d3d8/tests: oFog is not initialized on r200. --- dlls/d3d8/tests/visual.c | 65 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ffbfe3c..d8382f7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -774,122 +774,123 @@ static void fog_with_shader_test(void) int pshader; D3DFOGMODE vfog; D3DFOGMODE tfog; + BOOL uninitialized_reg; unsigned int color[11]; } test_data[] = { /* Only pixel shader */ - {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, + {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, D3DFOG_EXP, D3DFOG_LINEAR, + {0, 1, D3DFOG_EXP, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, D3DFOG_EXP2, D3DFOG_LINEAR, + {0, 1, D3DFOG_EXP2, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, + {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, + {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* Vertex shader */ - {1, 0, D3DFOG_NONE, D3DFOG_NONE, + {1, 0, D3DFOG_NONE, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 0, D3DFOG_NONE, D3DFOG_LINEAR, + {1, 0, D3DFOG_NONE, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, D3DFOG_EXP, D3DFOG_LINEAR, + {1, 0, D3DFOG_EXP, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, D3DFOG_EXP2, D3DFOG_LINEAR, + {1, 0, D3DFOG_EXP2, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, + {1, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* Vertex shader and pixel shader */ /* The next 4 tests would read the fog coord output, but it isn't available. * The result is a fully fogged quad, no matter what the Z coord is. */ - {1, 1, D3DFOG_NONE, D3DFOG_NONE, + {1, 1, D3DFOG_NONE, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_LINEAR, D3DFOG_NONE, + {1, 1, D3DFOG_LINEAR, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_EXP, D3DFOG_NONE, + {1, 1, D3DFOG_EXP, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_EXP2, D3DFOG_NONE, + {1, 1, D3DFOG_EXP2, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, /* These use the Z coordinate with linear table fog */ - {1, 1, D3DFOG_NONE, D3DFOG_LINEAR, + {1, 1, D3DFOG_NONE, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_EXP, D3DFOG_LINEAR, + {1, 1, D3DFOG_EXP, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_EXP2, D3DFOG_LINEAR, + {1, 1, D3DFOG_EXP2, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, + {1, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* Non-linear table fog without fog coord */ - {1, 1, D3DFOG_NONE, D3DFOG_EXP, + {1, 1, D3DFOG_NONE, D3DFOG_EXP, FALSE, {0x00ff0000, 0x00e71800, 0x00d12e00, 0x00bd4200, 0x00ab5400, 0x009b6400, 0x008d7200, 0x007f8000, 0x00738c00, 0x00689700, 0x005ea100}}, - {1, 1, D3DFOG_NONE, D3DFOG_EXP2, + {1, 1, D3DFOG_NONE, D3DFOG_EXP2, FALSE, {0x00fd0200, 0x00f50200, 0x00f50a00, 0x00e91600, 0x00d92600, 0x00c73800, 0x00b24d00, 0x009c6300, 0x00867900, 0x00728d00, 0x005ea100}}, /* These tests fail on older Nvidia drivers */ /* Foggy vertex shader */ - {2, 0, D3DFOG_NONE, D3DFOG_NONE, + {2, 0, D3DFOG_NONE, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, D3DFOG_EXP, D3DFOG_NONE, + {2, 0, D3DFOG_EXP, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, D3DFOG_EXP2, D3DFOG_NONE, + {2, 0, D3DFOG_EXP2, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, D3DFOG_LINEAR, D3DFOG_NONE, + {2, 0, D3DFOG_LINEAR, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, /* Foggy vertex shader and pixel shader. First 4 tests with vertex fog, * all using the fixed fog-coord linear fog */ - {2, 1, D3DFOG_NONE, D3DFOG_NONE, + {2, 1, D3DFOG_NONE, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, D3DFOG_EXP, D3DFOG_NONE, + {2, 1, D3DFOG_EXP, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, D3DFOG_EXP2, D3DFOG_NONE, + {2, 1, D3DFOG_EXP2, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, D3DFOG_LINEAR, D3DFOG_NONE, + {2, 1, D3DFOG_LINEAR, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, /* These use table fog. Here the shader-provided fog coordinate is * ignored and the z coordinate used instead */ - {2, 1, D3DFOG_NONE, D3DFOG_EXP, + {2, 1, D3DFOG_NONE, D3DFOG_EXP, FALSE, {0x00ff0000, 0x00e71800, 0x00d12e00, 0x00bd4200, 0x00ab5400, 0x009b6400, 0x008d7200, 0x007f8000, 0x00738c00, 0x00689700, 0x005ea100}}, - {2, 1, D3DFOG_NONE, D3DFOG_EXP2, + {2, 1, D3DFOG_NONE, D3DFOG_EXP2, FALSE, {0x00fd0200, 0x00f50200, 0x00f50a00, 0x00e91600, 0x00d92600, 0x00c73800, 0x00b24d00, 0x009c6300, 0x00867900, 0x00728d00, 0x005ea100}}, - {2, 1, D3DFOG_NONE, D3DFOG_LINEAR, + {2, 1, D3DFOG_NONE, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, }; @@ -996,7 +997,7 @@ static void fog_with_shader_test(void) /* As the red and green component are the result of blending use 5% tolerance on the expected value */ color = getPixelColor(device, 128, 240); - ok(color_match(color, test_data[i].color[j], 13), + ok(color_match(color, test_data[i].color[j], 13) || broken(test_data[i].uninitialized_reg), "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]);

1 0

Stefan Dösinger : ddraw/tests: r200 ignores the alpha channel when matching color keys.
by Alexandre Julliard 13 Mar '15

13 Mar '15

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 13 Mar '15

13 Mar '15

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