November 2014 - Wine-commits

Stefan Dösinger : d3d8/tests: Fix test_cursor().
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 4e8da470f850245a1b2bbac850b8ee59e135c560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8da470f850245a1b2bbac85… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 21 18:32:30 2014 +0100 d3d8/tests: Fix test_cursor(). --- dlls/d3d8/tests/device.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c8f9713..99fe70a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -759,6 +759,7 @@ static void test_cursor(void) HCURSOR cur; HWND window; HRESULT hr; + BOOL ret; pGetCursorInfo = (void *)GetProcAddress(user32_handle, "GetCursorInfo"); if (!pGetCursorInfo) @@ -767,14 +768,19 @@ static void test_cursor(void) return; } + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + + ret = SetCursorPos(50, 50); + ok(ret, "Failed to set cursor position.\n"); + flush_events(); + memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -817,12 +823,11 @@ static void test_cursor(void) hr = IDirect3DDevice8_ShowCursor(device, TRUE); ok(hr == TRUE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); - /* GDI cursor unchanged */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9/tests: Fix test_cursor().
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: abf44708a4ac016b86bd0ed747cf8c88dc3f7eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf44708a4ac016b86bd0ed74… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 25 10:16:53 2014 +0100 d3d9/tests: Fix test_cursor(). --- dlls/d3d9/tests/device.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 061846b..04bdf41 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1571,15 +1571,20 @@ static void test_cursor(void) HCURSOR cur; HWND window; HRESULT hr; + BOOL ret; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + ret = SetCursorPos(50, 50); + ok(ret, "Failed to set cursor position.\n"); + flush_events(); memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -1623,12 +1628,11 @@ static void test_cursor(void) hr = IDirect3DDevice9_ShowCursor(device, TRUE); ok(hr == TRUE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); - /* GDI cursor unchanged */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Jacek Caban : mshtml/tests: Fixed some test failures.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 53d2778f97f865da6978b87d13ce74936f5064ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d2778f97f865da6978b87d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 25 13:22:44 2014 +0100 mshtml/tests: Fixed some test failures. --- dlls/mshtml/tests/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 84b8806..ace3128 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2988,6 +2988,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 144: /* TODO */ case 178: case 179: + case 180: + case 181: + case 182: return E_NOTIMPL; default:

1 0

André Hentschel : d3d10core: Remove unused struct ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 5ddc53f30e422b78970093d783188f5a63c4f70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddc53f30e422b78970093d78… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:12 2014 +0100 d3d10core: Remove unused struct (Clang). --- dlls/d3d10core/device.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ad6bc4d..44a8085 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -2173,13 +2173,6 @@ static const struct ID3D10MultithreadVtbl d3d10_multithread_vtbl = d3d10_multithread_GetMultithreadProtected, }; -static void STDMETHODCALLTYPE d3d10_subresource_destroyed(void *parent) {} - -static const struct wined3d_parent_ops d3d10_subresource_parent_ops = -{ - d3d10_subresource_destroyed, -}; - /* IWineDXGIDeviceParent IUnknown methods */ static inline struct d3d10_device *device_from_dxgi_device_parent(IWineDXGIDeviceParent *iface)

1 0

André Hentschel : dwrite: Remove unused code (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 2b3c5d6194c4843a7f8ec4a53099e2397fe54131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3c5d6194c4843a7f8ec4a53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:56 2014 +0100 dwrite: Remove unused code (Clang). --- dlls/dwrite/bidi.c | 6 ------ dlls/dwrite/shape.c | 2 -- 2 files changed, 8 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 48a7a06..69eae5a 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -513,12 +513,6 @@ static inline int get_prev_valid_char_from_run(IsolatedRun *run, int index) return index; } -static inline int iso_previousChar(IsolatedRun *run, int index) -{ - if (index <= 0) return -1; - return index--; -} - static inline void iso_dump_types(const char* header, IsolatedRun *run) { int i, len = 0; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index c1ae452..a603932 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -23,8 +23,6 @@ #include "dwrite_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dwrite); - struct scriptshaping_cache { IDWriteFontFace *fontface;

1 0

Nikolay Sivov : dwrite: Forward more font methods to fontface.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 7ae3426ea4198d614d2dc808d1de13799e983ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae3426ea4198d614d2dc808d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 22 20:15:27 2014 +0300 dwrite: Forward more font methods to fontface. --- dlls/dwrite/font.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index eb7a274..cef4a27 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -782,8 +782,16 @@ static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont2 *iface) static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + IDWriteFontFace2 *fontface; + HRESULT hr; + + TRACE("(%p)\n", This); + + hr = get_fontface_from_font(This, &fontface); + if (FAILED(hr)) + return hr; + + return IDWriteFontFace2_IsSymbolFont(fontface); } static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont2 *iface, IDWriteLocalizedStrings **names) @@ -965,18 +973,34 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 m return IDWriteFontFace2_GetUnicodeRanges(fontface, max_count, ranges, count); } -static HRESULT WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) +static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + IDWriteFontFace2 *fontface; + HRESULT hr; + + TRACE("(%p)\n", This); + + hr = get_fontface_from_font(This, &fontface); + if (FAILED(hr)) + return hr; + + return IDWriteFontFace2_IsMonospacedFont(fontface); } static HRESULT WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + IDWriteFontFace2 *fontface; + HRESULT hr; + + TRACE("(%p)\n", This); + + hr = get_fontface_from_font(This, &fontface); + if (FAILED(hr)) + return hr; + + return IDWriteFontFace2_IsColorFont(fontface); } static const IDWriteFont2Vtbl dwritefontvtbl = {

1 0

Nikolay Sivov : dwrite: Update to IDWriteBitmapRenderTarget1.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: b8db7f6a04bbf92fb8d720c891a51f80a34baa31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8db7f6a04bbf92fb8d720c89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 23 22:22:01 2014 +0300 dwrite: Update to IDWriteBitmapRenderTarget1. --- dlls/dwrite/gdiinterop.c | 92 +++++++++++++++++++++++++++++++----------------- dlls/dwrite/tests/font.c | 25 +++++++++++++ 2 files changed, 84 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8db7f6a04bbf92fb8d72…

1 0

André Hentschel : Add WWN 380
by Jeremy Newman 21 Nov '14

21 Nov '14

Module: website Branch: master Commit: 3c7a591499d920f56a5d3afe6cf61027abb44d52 URL: http://source.winehq.org/git/website.git/?a=commit;h=3c7a591499d920f56a5d3a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 22:45:52 2014 +0100 Add WWN 380 --- news/de/2014112101.xml | 11 + news/en/2014112101.xml | 11 + wwn/en/wn20141121_380.xml | 511 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 533 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=3c7a591499d920f56a…

1 0

Julian Rüger : Download: Fix html tags and mailto link
by Jeremy Newman 21 Nov '14

21 Nov '14

Module: website Branch: master Commit: 04aeba97b863025c65662e36ad09a3d81c0496c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=04aeba97b863025c65662e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 21 16:11:38 2014 +0100 Download: Fix html tags and mailto link --- templates/en/download.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index a1cf748..bf494b6 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -63,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">Download Ubuntu packages</a></b> - - binary and source .debs for Ubuntu Trusty (14.04 LTS) + - binary and source .debs for Ubuntu Trusty (14.04 LTS)</td> <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> @@ -85,9 +85,9 @@ requested in exchange for hosting the Wine web site.</p> compatible distributions. The wine meta package is available via <tt>yum</tt> through the EPEL / Fedora Extras / Fedora repository by running <tt>$ yum install - wine </tt>" + wine </tt> </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">

1 0

Jeremy Newman : fix typo
by Jeremy Newman 21 Nov '14

21 Nov '14

Module: website Branch: master Commit: 69beaf110089cd1bd0ee968abd525718e0bb5073 URL: http://source.winehq.org/git/website.git/?a=commit;h=69beaf110089cd1bd0ee96… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 21 13:04:43 2014 -0600 fix typo --- include/plugins/news.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index aae63d2..a42c9fc 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -111,7 +111,7 @@ switch (true) unset($c); $rss = array( 'rss_date' => date("r", $top_date), - 'rss_title' => "{$config->site_name News", + 'rss_title' => "{$config->site_name} News", 'rss_link' => "{$config->base_url}news/rss/", 'rss_img' => "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…", 'rss_desc' => 'News and information about Wine',

1 0