December 2013 - Wine-Commits

Frédéric Delanoy : wininet/tests: Use BOOL type where appropriate.
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: wine Branch: master Commit: e1ef0d11744592fb5f2d2a2b694e4bb3268b3dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ef0d11744592fb5f2d2a2b6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 5 10:29:37 2013 +0100 wininet/tests: Use BOOL type where appropriate. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index dae5be0..eb09bc7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1954,7 +1954,7 @@ static DWORD CALLBACK server_thread(LPVOID param) WSADATA wsaData; int last_request = 0; char host_header[22]; - static int test_b = 0; + static BOOL test_b = FALSE; static int test_no_cache = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -2094,7 +2094,7 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (!test_b && strstr(buffer, "/testB HTTP/1.1")) { - test_b = 1; + test_b = TRUE; send(c, okmsg, sizeof okmsg-1, 0); recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); send(c, okmsg, sizeof okmsg-1, 0);

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: wine Branch: master Commit: 02bb13c029edbce9c9a3ffcfa0f48d9b4ca19c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bb13c029edbce9c9a3ffcfa… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 5 01:26:43 2013 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index d0290ba..130dc89 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-06-19 23:36-0300\n" +"PO-Revision-Date: 2013-12-05 01:21-0200\n" "Last-Translator: Bruno Jesus <00cpxxx(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -4708,10 +4708,8 @@ msgid "No Unicode translation.\n" msgstr "Sem tradução Unicode.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" -msgstr "Falha na inicialização do DLL.\n" +msgstr "Falha ao iniciar DLL.\n" #: winerror.mc:1371 msgid "Shutdown in progress.\n" @@ -12800,10 +12798,8 @@ msgid "Select Drive Letter" msgstr "Selecione a Letra" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Configuração do Wine" +msgstr "Configuração de unidades" #: winecfg.rc:227 msgid "" @@ -13082,10 +13078,8 @@ msgid "Letter" msgstr "Letra" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Nova Pasta" +msgstr "Diretório alvo" #: winecfg.rc:79 msgid ""

1 0

刘涛 : website: Add some Chinese translation
by Jeremy Newman Dec. 5, 2013

Dec. 5, 2013

Module: website Branch: master Commit: 98d9179d5543613d20aded7b0ac4d0cb1492af8a URL: http://source.winehq.org/git/website.git/?a=commit;h=98d9179d5543613d20aded… Author: 刘涛 <wendaotao(a)163.com> Date: Thu Dec 5 14:56:46 2013 +0800 website: Add some Chinese translation --- templates/zh-cn/news.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/zh-cn/news.template b/templates/zh-cn/news.template index 674b208..ea32da2 100644 --- a/templates/zh-cn/news.template +++ b/templates/zh-cn/news.template @@ -8,9 +8,9 @@ <hr /> <div class="link-container"> - <p><a href="{$root}/wwn/">World Wine News Archive</a></p> + <p><a href="{$root}/wwn/">全部 Wine 新闻归档</a></p> </div> <ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> + <li><a href="{$root}/news/rss/">WineHQ 新闻 RSS 订阅</a></li> </ul>

1 0

刘涛 : website: Add Chinese translation for wine 1.7.7 released
by Jeremy Newman Dec. 5, 2013

Dec. 5, 2013

Module: website Branch: master Commit: 38009f1e981e2683993eb7a8bc740b6992a67658 URL: http://source.winehq.org/git/website.git/?a=commit;h=38009f1e981e2683993eb7… Author: 刘涛 <wendaotao(a)163.com> Date: Thu Dec 5 14:29:59 2013 +0800 website: Add Chinese translation for wine 1.7.7 released --- news/zh-cn/2013112201.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013112201.xml b/news/zh-cn/2013112201.xml new file mode 100644 index 0000000..5269e82 --- /dev/null +++ b/news/zh-cn/2013112201.xml @@ -0,0 +1,16 @@ +<news> +<date>十一月 22, 2013</date> +<title>Wine 1.7.7 发布</title> +<body> +<p> Wine 开发版 1.7.7 现在可以使用了。</p> +<p> 本次<a href="{$root}/announce/1.7.7">更新</a> : +<ul> + <li>利用 Samba 的 NetAPI 库来支持配置远程共享。</li> + <li>在 Mac 驱动中支持多种键盘布局。</li> + <li>通过 XEMBED 改进了对嵌套的支持。</li> + <li>在 VBScript 中支持数组。</li> + <li>各种 bug 的修复</li> +</ul> +<p>源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.7.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>. +</p></body></news>

1 0

Vincent Povirk : winemono: Added 4.5.2 release.
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: tools Branch: master Commit: d247bd099b08a43580ee936a19e1acc445ad1de1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d247bd099b08a43580ee936a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 4 10:57:27 2013 -0600 winemono: Added 4.5.2 release. --- winemono.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/winemono.php b/winemono.php index 0e03a70..c82ddda 100644 --- a/winemono.php +++ b/winemono.php @@ -4,7 +4,7 @@ */ // Default version if none given -$sVersion = '0.0.8'; +$sVersion = '4.5.2'; // Suffix appended to base name of file $sFileSuffix = ''; @@ -28,7 +28,8 @@ $sFileName = sprintf('%s/%s/wine-mono-%s.%s', $sFolder, $sVersion, $sFileSuffix, // Size array $aFileSizes = array( '0.0.4'=>44408320, - '0.0.8'=>46967296 + '0.0.8'=>46967296, + '4.5.2'=>52502528 ); // Exact size of the file:

1 0

Henri Verbeet : ddraw: Reject creating primary surfaces with DDSCAPS_TEXTURE.
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 6cba2285bc9bc5adeed3f4300d4a23c3e23c56a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cba2285bc9bc5adeed3f4300… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 4 09:49:37 2013 +0100 ddraw: Reject creating primary surfaces with DDSCAPS_TEXTURE. --- dlls/ddraw/surface.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9d570e4..79d5b31 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5627,13 +5627,21 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface) desc->dwFlags &= ~DDSD_LPSURFACE; - if ((desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) - == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) - && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); - HeapFree(GetProcessHeap(), 0, texture); - return DDERR_NOEXCLUSIVEMODE; + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { + WARN("Tried to create a primary surface with DDSCAPS_TEXTURE.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if ((desc->ddsCaps.dwCaps & DDSCAPS_FLIP) && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + { + WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_NOEXCLUSIVEMODE; + } } /* This is a special case in ddrawex, but not allowed in ddraw. */

1 0

Aric Stewart : gdi32: Use vertical orientation table to determine rotation.
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: ff0717d004ece67f3fe7e25c49c2e0510e3d04f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0717d004ece67f3fe7e25c4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 15 10:37:45 2013 -0600 gdi32: Use vertical orientation table to determine rotation. --- dlls/gdi32/freetype.c | 50 ++++-------------------------------------------- 1 files changed, 5 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e230299..cbaddd2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6139,54 +6139,15 @@ static inline BYTE get_max_level( UINT format ) return 255; } -static const struct { WCHAR lower; WCHAR upper;} unrotate_ranges[] = - { - {0x0000, 0x10FF}, - /* Hangul Jamo */ - {0x1200, 0x17FF}, - /* Mongolian */ - {0x18B0, 0x1FFF}, - /* General Punctuation */ - {0x2070, 0x209F}, - /* Currency Symbols */ - /* Combining Diacritical Marks for Symbols */ - /* Letterlike Symbols */ - {0x2150, 0x245F}, - /* Enclosed Alphanumerics */ - {0x2500, 0x259F}, - /* Geometric Shapes */ - /* Miscellaneous Symbols */ - /* Dingbats */ - /* Miscellaneous Mathematical Symbols-A */ - /* Supplemental Arrows-A */ - {0x2800, 0x2E7F}, - /* East Asian scripts and symbols */ - {0xA000, 0xABFF}, - /* Hangul Syllables */ - /* Hangul Jamo Extended-B */ - {0xD800, 0xDFFF}, - /* Private Use Area */ - /* CJK Compatibility Ideographs */ - {0xFB00, 0xFE0F}, - /* Vertical Forms */ - /* Combining Half Marks */ - /* CJK Compatibility Forms */ - {0xFE50, 0xFEFF}, - /* Halfwidth and Fullwidth Forms */ - {0xFFEF, 0xFFFF}, - }; +extern const unsigned short vertical_orientation_table[]; static BOOL check_unicode_tategaki(WCHAR uchar) { - int i; - for (i = 0 ;; i++) - { - if (uchar < unrotate_ranges[i].lower) - return TRUE; + unsigned short orientation = vertical_orientation_table[vertical_orientation_table[vertical_orientation_table[uchar >> 8]+((uchar >> 4) & 0x0f)]+ (uchar & 0xf)]; - if (uchar >= unrotate_ranges[i].lower && uchar <= unrotate_ranges[i].upper) - return FALSE; - } + /* We only reach this code if typographical substitution did not occur */ + /* Type: U or Type: Tu */ + return (orientation == 1 || orientation == 3); } static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; @@ -6238,7 +6199,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index, &vert); ft_face = font->ft_face; original_index = glyph_index; - /* We know what unicode ranges get rotated */ if (!vert && tategaki) tategaki = check_unicode_tategaki(glyph); }

1 0

Aric Stewart : wineps: Use vertical orientation table to determine rotation .
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 7e079b061766162a9ca0fff85961948805ee3ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e079b061766162a9ca0fff85… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 15 10:37:45 2013 -0600 wineps: Use vertical orientation table to determine rotation. --- dlls/wineps.drv/text.c | 54 ++++++++--------------------------------------- 1 files changed, 10 insertions(+), 44 deletions(-) diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 7ba59f9..96728ca 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -40,54 +40,20 @@ static BOOL PSDRV_Text(PHYSDEV dev, INT x, INT y, UINT flags, LPCWSTR str, UINT count, BOOL bDrawBackground, const INT *lpDx); -static const struct { WCHAR lower; WCHAR upper;} unrotate_ranges[] = - { - {0x0000, 0x10FF}, - /* Hangul Jamo */ - {0x1200, 0x17FF}, - /* Mongolian */ - {0x18B0, 0x1FFF}, - /* General Punctuation */ - {0x2070, 0x209F}, - /* Currency Symbols */ - /* Combining Diacritical Marks for Symbols */ - /* Letterlike Symbols */ - {0x2150, 0x245F}, - /* Enclosed Alphanumerics */ - {0x2500, 0x259F}, - /* Geometric Shapes */ - /* Miscellaneous Symbols */ - /* Dingbats */ - /* Miscellaneous Mathematical Symbols-A */ - /* Supplemental Arrows-A */ - {0x2800, 0x2E7F}, - /* East Asian scripts and symbols */ - {0xA000, 0xABFF}, - /* Hangul Syllables */ - /* Hangul Jamo Extended-B */ - {0xD800, 0xDFFF}, - /* Private Use Area */ - /* CJK Compatibility Ideographs */ - {0xFB00, 0xFE0F}, - /* Vertical Forms */ - /* Combining Half Marks */ - /* CJK Compatibility Forms */ - {0xFE50, 0xFEFF}, - /* Halfwidth and Fullwidth Forms */ - {0xFFEF, 0xFFFF}, - }; +extern const unsigned short vertical_orientation_table[]; static BOOL check_unicode_tategaki(WCHAR uchar) { - int i; - for (i = 0 ;; i++) - { - if (uchar < unrotate_ranges[i].lower) - return TRUE; - - if (uchar >= unrotate_ranges[i].lower && uchar <= unrotate_ranges[i].upper) - return FALSE; - } + unsigned short orientation = vertical_orientation_table[vertical_orientation_table[vertical_orientation_table[uchar >> 8]+((uchar >> 4) & 0x0f)]+ (uchar & 0xf)]; + + /* Type: U or Type: Tu */ + /* TODO Type: Tr, Normally the logic for Tr would be that if + Typographical substitution occurs, then do not rotate. However + we have no facility at present to determine if GetGlyphIndices is + successfully performing substitutions (well formed font) or not. + Thus we are erroring on the side of the font being well formed, + doing typographical substitution, and so we are not doing rotation */ + return (orientation == 1 || orientation == 2 || orientation == 3); } static Run* build_vertical_runs(PHYSDEV dev, UINT flags, LPCWSTR str, UINT count, INT *run_count)

1 0

Stefan Dösinger : d3d9/tests: Extend the sysmem texture mipmap test.
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 799c2fb866908df43b7cd477a24da106efb287ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=799c2fb866908df43b7cd477a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 4 14:01:31 2013 +0100 d3d9/tests: Extend the sysmem texture mipmap test. --- dlls/d3d9/tests/d3d9ex.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index c22a1f0..5825c35 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -556,6 +556,13 @@ static void test_texture_sysmem_create(void) hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 1, 1, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 2, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);

1 0

Frédéric Delanoy : shlwapi/tests: Avoid memory leaks (coverity).
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 9be5df10ae131cdedd0d8bbd994b8eae06bb9634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be5df10ae131cdedd0d8bbd9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 2 22:24:49 2013 +0100 shlwapi/tests: Avoid memory leaks (coverity). --- dlls/shlwapi/tests/ordinal.c | 11 ++++++++--- dlls/shlwapi/tests/url.c | 9 +++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 2f7de63..676c431 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2272,7 +2272,7 @@ static const IServiceProviderVtbl IServiceProviderImpl_Vtbl = static void test_IUnknown_QueryServiceExec(void) { - IServiceProvider *provider = IServiceProviderImpl_Construct(); + IServiceProvider *provider; static const GUID dummy_serviceid = { 0xdeadbeef }; static const GUID dummy_groupid = { 0xbeefbeef }; call_trace_t trace_expected; @@ -2286,6 +2286,8 @@ static void test_IUnknown_QueryServiceExec(void) return; } + provider = IServiceProviderImpl_Construct(); + /* null source pointer */ hr = pIUnknown_QueryServiceExec(NULL, &dummy_serviceid, &dummy_groupid, 0, 0, 0, 0); ok(hr == E_FAIL, "got 0x%08x\n", hr); @@ -2384,8 +2386,8 @@ static const IProfferServiceVtbl IProfferServiceImpl_Vtbl = static void test_IUnknown_ProfferService(void) { - IServiceProvider *provider = IServiceProviderImpl_Construct(); - IProfferService *proff = IProfferServiceImpl_Construct(); + IServiceProvider *provider; + IProfferService *proff; static const GUID dummy_serviceid = { 0xdeadbeef }; call_trace_t trace_expected; HRESULT hr; @@ -2399,6 +2401,9 @@ static void test_IUnknown_ProfferService(void) return; } + provider = IServiceProviderImpl_Construct(); + proff = IProfferServiceImpl_Construct(); + /* null source pointer */ hr = pIUnknown_ProfferService(NULL, &dummy_serviceid, 0, 0); ok(hr == E_FAIL, "got 0x%08x\n", hr); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 7c1fdb5..f53a545 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1082,10 +1082,7 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla HRESULT hr; CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; WCHAR wszReturnUrl[INTERNET_MAX_URL_LENGTH]; - LPWSTR wszUrl1 = GetWideString(szUrl1); - LPWSTR wszUrl2 = GetWideString(szUrl2); - LPWSTR wszExpectUrl = GetWideString(szExpectUrl); - LPWSTR wszConvertedUrl; + LPWSTR wszUrl1, wszUrl2, wszExpectUrl, wszConvertedUrl; DWORD dwSize; DWORD dwExpectLen = lstrlenA(szExpectUrl); @@ -1095,6 +1092,10 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla return; } + wszUrl1 = GetWideString(szUrl1); + wszUrl2 = GetWideString(szUrl2); + wszExpectUrl = GetWideString(szExpectUrl); + hr = pUrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags); ok(hr == E_INVALIDARG, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG);

1 0