November 2014 - Wine-Commits

Bruno Jesus : user32/tests: Ensure ShowWindow returns false when window is already hidden.
by Alexandre Julliard Nov. 25, 2014

Nov. 25, 2014

Module: wine Branch: master Commit: 30120041c8b742354d8e5c5a99a6abd80f0fd3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30120041c8b742354d8e5c5a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 24 23:54:45 2014 -0200 user32/tests: Ensure ShowWindow returns false when window is already hidden. --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 28bb35e..778b3cf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4626,7 +4626,7 @@ static DWORD CALLBACK show_window_thread(LPVOID arg) HWND hwnd = arg; /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ - ShowWindow(hwnd, SW_HIDE); + ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); return 0; } @@ -4669,7 +4669,7 @@ static void test_messages(void) ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); /* test ShowWindow(SW_HIDE) on a hidden window - single threaded */ - ShowWindow(hwnd, SW_HIDE); + ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); flush_events(); ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE);

1 0

Nikolay Sivov : gdi32: Remove undefs for names that are never defined.
by Alexandre Julliard Nov. 25, 2014

Nov. 25, 2014

Module: wine Branch: master Commit: 2f0a4a4425bdb8a68833ee4ea5cd562fd279dc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0a4a4425bdb8a68833ee4ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 24 16:23:11 2014 +0300 gdi32: Remove undefs for names that are never defined. --- dlls/gdi32/font.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index af3ea5b..d9bb43a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1660,8 +1660,7 @@ UINT WINAPI GetOutlineTextMetricsW( output->otmsStrikeoutPosition = height_to_LP( dc, output->otmsStrikeoutPosition); output->otmsUnderscoreSize = height_to_LP( dc, output->otmsUnderscoreSize); output->otmsUnderscorePosition = height_to_LP( dc, output->otmsUnderscorePosition); -#undef WDPTOLP -#undef HDPTOLP + if(output != lpOTM) { memcpy(lpOTM, output, cbData);

1 0

Nikolay Sivov : dwrite: Use usWin* values from OS/2 table as font ascent/ descent.
by Alexandre Julliard Nov. 25, 2014

Nov. 25, 2014

Module: wine Branch: master Commit: 87a9b51ccc8b82c72c55177777b4bffc8cd31f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a9b51ccc8b82c72c5517777… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 24 12:06:38 2014 +0300 dwrite: Use usWin* values from OS/2 table as font ascent/descent. --- dlls/dwrite/opentype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1f5e178..a0f1c31 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -867,8 +867,8 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po memset(metrics, 0, sizeof(*metrics)); if (tt_os2) { - metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); - metrics->descent = GET_BE_WORD(tt_os2->sTypoDescender); + metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); + metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight);

1 0

Nikolay Sivov : dwrite: Update to IDWriteBitmapRenderTarget1.
by Alexandre Julliard Nov. 25, 2014

Nov. 25, 2014

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 : dwrite: Remove unused code (Clang).
by Alexandre Julliard Nov. 25, 2014

Nov. 25, 2014

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

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

Nov. 25, 2014

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

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

Nov. 25, 2014

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

André Hentschel : Add WWN 380
by Jeremy Newman Nov. 21, 2014

Nov. 21, 2014

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

Jeremy Newman : fix typo
by Jeremy Newman Nov. 21, 2014

Nov. 21, 2014

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

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman Nov. 21, 2014

Nov. 21, 2014

Module: website Branch: master Commit: 1de2290da91ebd98f3d129dc4d8bae0e605825b9 URL: http://source.winehq.org/git/website.git/?a=commit;h=1de2290da91ebd98f3d129… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 21 13:05:01 2014 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0