February 2015 - Wine-commits

Henri Verbeet : d2d1: Implement d2d_factory_CreateDrawingStateBlock().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: a6409ed027d31d7f2541b8515f4abb369a57ece0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6409ed027d31d7f2541b8515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:29 2015 +0100 d2d1: Implement d2d_factory_CreateDrawingStateBlock(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 9 ++++ dlls/d2d1/factory.c | 14 +++++- dlls/d2d1/state_block.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 1e829da..2828bac 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ factory.c \ mesh.c \ render_target.c \ + state_block.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 72c1c57..42694d2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -170,4 +170,13 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; +struct d2d_state_block +{ + ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface; + LONG refcount; +}; + +void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, + IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 27370c1..918fa13 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -165,10 +165,20 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock **state_block) { - FIXME("iface %p, desc %p, text_rendering_params %p, state_block %p stub!\n", + struct d2d_state_block *object; + + TRACE("iface %p, desc %p, text_rendering_params %p, state_block %p.\n", iface, desc, text_rendering_params, state_block); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_state_block_init(object, desc, text_rendering_params); + + TRACE("Created state block %p.\n", object); + *state_block = &object->ID2D1DrawingStateBlock_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface, diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c new file mode 100644 index 0000000..4aa8cd4 --- /dev/null +++ b/dlls/d2d1/state_block.c @@ -0,0 +1,123 @@ +/* + * Copyright 2015 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_state_block *impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_state_block_QueryInterface(ID2D1DrawingStateBlock *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1DrawingStateBlock) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1DrawingStateBlock_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_state_block_AddRef(ID2D1DrawingStateBlock *iface) +{ + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + ULONG refcount = InterlockedIncrement(&state_block->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *iface) +{ + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + ULONG refcount = InterlockedDecrement(&state_block->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, state_block); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_state_block_GetFactory(ID2D1DrawingStateBlock *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBlock *iface, + D2D1_DRAWING_STATE_DESCRIPTION *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBlock *iface, + const D2D1_DRAWING_STATE_DESCRIPTION *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1DrawingStateBlock *iface, + IDWriteRenderingParams *text_rendering_params) +{ + FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); +} + +static void STDMETHODCALLTYPE d2d_state_block_GetTextRenderingParams(ID2D1DrawingStateBlock *iface, + IDWriteRenderingParams **text_rendering_params) +{ + FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); +} + +static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl = +{ + d2d_state_block_QueryInterface, + d2d_state_block_AddRef, + d2d_state_block_Release, + d2d_state_block_GetFactory, + d2d_state_block_GetDescription, + d2d_state_block_SetDescription, + d2d_state_block_SetTextRenderingParams, + d2d_state_block_GetTextRenderingParams, +}; + +void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, + IDWriteRenderingParams *text_rendering_params) +{ + FIXME("Ignoring state block properties.\n"); + + state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl; + state_block->refcount = 1; +}

1 0

Henri Verbeet : d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateBuffer().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 58896c610f083997ab2cb1378fd7ed6dc1057d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=58896c610f083997ab2cb1378… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:30 2015 +0100 d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateBuffer(). At this point it doesn't really add anything anymore. --- dlls/d3d10core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ccac3f2..7b811a6 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1381,7 +1381,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, struct d3d10_buffer *object; HRESULT hr; - FIXME("iface %p, desc %p, data %p, buffer %p partial stub!\n", iface, desc, data, buffer); + TRACE("iface %p, desc %p, data %p, buffer %p.\n", iface, desc, data, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object)

1 0

Henri Verbeet : d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateTexture2D().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: e46bdc28f68a8d8d585376027e8072bb449c74bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46bdc28f68a8d8d585376027… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:31 2015 +0100 d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateTexture2D(). --- dlls/d3d10core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7b811a6..7f41360 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1418,7 +1418,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa struct d3d10_texture2d *object; HRESULT hr; - FIXME("iface %p, desc %p, data %p, texture %p partial stub!\n", iface, desc, data, texture); + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object)

1 0

Henri Verbeet : wined3d: Apply modifiers after floatBitsToInt()/ floatBitsToUint() in shader_glsl_add_src_param().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 3fa8f4ece38da2ee75b3b5f639a3cce64523b0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa8f4ece38da2ee75b3b5f63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:32 2015 +0100 wined3d: Apply modifiers after floatBitsToInt()/floatBitsToUint() in shader_glsl_add_src_param(). --- dlls/wined3d/glsl_shader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0017e45..0804997 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1758,28 +1758,28 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i } else { - char param_str[200]; - - shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, param_str); + char reg_name[200]; switch (wined3d_src->reg.data_type) { case WINED3D_DATA_FLOAT: - sprintf(glsl_src->param_str, "%s", param_str); + sprintf(reg_name, "%s", glsl_src->reg_name); break; case WINED3D_DATA_INT: - sprintf(glsl_src->param_str, "floatBitsToInt(%s)", param_str); + sprintf(reg_name, "floatBitsToInt(%s)", glsl_src->reg_name); break; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(glsl_src->param_str, "floatBitsToUint(%s)", param_str); + sprintf(reg_name, "floatBitsToUint(%s)", glsl_src->reg_name); break; default: FIXME("Unhandled data type %#x.\n", wined3d_src->reg.data_type); - sprintf(glsl_src->param_str, "%s", param_str); + sprintf(reg_name, "%s", glsl_src->reg_name); break; } + + shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name, swizzle_str, glsl_src->param_str); } }

1 0

Nikolay Sivov : dwrite: Use vertical variants in GetGlyphs() when appropriate.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 980c65f1266d4f87166d2199d302d178cc6e651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=980c65f1266d4f87166d2199d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 15:50:41 2015 +0300 dwrite: Use vertical variants in GetGlyphs() when appropriate. --- dlls/dwrite/analyzer.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index b9caefd..62a6b15 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -864,8 +864,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, const struct dwritescript_properties *scriptprops; struct scriptshaping_context context; struct scriptshaping_cache *cache = NULL; + BOOL update_cluster, need_vertical; + IDWriteFontFace1 *fontface1; WCHAR *string; - BOOL update_cluster; UINT32 i, g; HRESULT hr = S_OK; UINT16 script; @@ -909,6 +910,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (!string) return E_OUTOFMEMORY; + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (FAILED(hr)) + WARN("failed to get IDWriteFontFace1\n"); + + need_vertical = is_sideways && fontface1 && IDWriteFontFace1_HasVerticalGlyphVariants(fontface1); + for (i = 0, g = 0, update_cluster = FALSE; i < length; i++) { UINT32 codepoint; @@ -928,6 +935,14 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (FAILED(hr)) goto done; + if (need_vertical) { + UINT16 vertical; + + hr = IDWriteFontFace1_GetVerticalGlyphVariants(fontface1, 1, &glyph_indices[g], &vertical); + if (hr == S_OK) + glyph_indices[g] = vertical; + } + g++; } else { @@ -969,6 +984,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); done: + if (fontface1) + IDWriteFontFace1_Release(fontface1); release_scriptshaping_cache(cache); heap_free(string);

1 0

Bruno Jesus : rsaenh/tests: Fix a copy & paste issue.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 4d43d364e80326fa0bb571b6f0bb7ccb7e1a1a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d43d364e80326fa0bb571b6f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 18 12:25:21 2015 -0200 rsaenh/tests: Fix a copy & paste issue. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 072f08a..da74ffb 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1728,7 +1728,7 @@ static void test_rc4(void) dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - if (BASE_PROV || STRONG_PROV || nt4) + if (BASE_PROV || STRONG_PROV) ok(dwLen == 11, "expected salt length 11, got %d\n", dwLen); else ok(dwLen == 0 || broken(nt4 && dwLen == 11), "expected salt length 0, got %d\n", dwLen);

1 0

Mark Harmstone : comctl32: Do not call HEADER_FillItemFrame twice in a row.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 6a8da85c3bcee29d4c7fcb9f96e4ec20b4e9426c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8da85c3bcee29d4c7fcb9f9… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 17 22:35:27 2015 +0000 comctl32: Do not call HEADER_FillItemFrame twice in a row. --- dlls/comctl32/header.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index ac924fd..59f2c12 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -392,10 +392,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU if (ret) return phdi->rect.right; } else - { - HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); - } if (phdi->bDown) { r.left += 2;

1 0

Mark Harmstone : comctl32: Themed buttons should not draw in System if font unset.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 129862f3694fdd4f0badfc6f046a19b70810cf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=129862f3694fdd4f0badfc6f0… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 17 23:39:16 2015 +0000 comctl32: Themed buttons should not draw in System if font unset. --- dlls/comctl32/theme_button.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 9b0a5cf..5a3b4b4 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -181,8 +181,10 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); created_font = TRUE; } - } else + } else { font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + hPrevFont = SelectObject(hDC, font); + } GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); @@ -243,8 +245,10 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); created_font = TRUE; } - } else + } else { font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + hPrevFont = SelectObject(hDC, font); + } GetClientRect(hwnd, &bgRect); textRect = bgRect;

1 0

Nikolay Sivov : wshom.ocx: Implement RegWrite().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 4588bb117094f71de5ac9601fbc758ad6a8c9b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4588bb117094f71de5ac9601f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 08:39:25 2015 +0300 wshom.ocx: Implement RegWrite(). --- dlls/wshom.ocx/Makefile.in | 2 +- dlls/wshom.ocx/shell.c | 156 +++++++++++++++++++++++++++++++++++-------- dlls/wshom.ocx/tests/wshom.c | 81 +++++++++++++++++++++- 3 files changed, 210 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4588bb117094f71de5ac9…

1 0

Michael Stefaniuc : msvcrt: Avoid identical if and else bodies (PVS-Studio ).
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: e67a65c59e7013f22c3a873874e9552deef3b68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67a65c59e7013f22c3a87387… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:03:50 2015 +0100 msvcrt: Avoid identical if and else bodies (PVS-Studio). --- dlls/msvcrt/scanf.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index e85f343..9322704 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -423,8 +423,7 @@ _FUNCTION_ { st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(double); - else if (l_prefix) _SET_NUMBER_(double); + if (L_prefix || l_prefix) _SET_NUMBER_(double); else _SET_NUMBER_(float); } }

1 0