July 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Fix memory leak in error case.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 127b502ce7e041b52e7da1baa424123367a4fb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=127b502ce7e041b52e7da1baa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 16:17:42 2012 +0900 windowscodecs: Fix memory leak in error case. --- dlls/windowscodecs/palette.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 7d50d83..f033012 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -476,7 +476,11 @@ static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, colors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count); if (!colors) return E_OUTOFMEMORY; hr = IWICPalette_GetColors(source, count, colors, &count); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, colors); + return hr; + } } EnterCriticalSection(&This->lock);

1 0

Alexandre Julliard : gdi32: Compute the line parameters using the cropped coordinates to avoid overflows .
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 747d1631d5da53755119632ab035a0c32009a557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=747d1631d5da53755119632ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 16:52:02 2012 +0200 gdi32: Compute the line parameters using the cropped coordinates to avoid overflows. --- dlls/gdi32/dibdrv/objects.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f9736f6..4712dc1 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -616,7 +616,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return TRUE; for (i = 0; i < clipped_rects.count; i++) { @@ -762,7 +762,7 @@ static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *en struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); if (clip_rect_to_dib( &pdev->dib, &rect )) { POINT clipped_start, clipped_end; @@ -1030,7 +1030,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects ); for (i = 0; i < clipped_rects.count; i++) {

1 0

Hans Leidekker : fusion: Use inline wrappers for calling COM methods.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: fba3ba90179cea34ab25987aebd2c3b9173255c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba3ba90179cea34ab25987ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 31 12:25:21 2012 +0200 fusion: Use inline wrappers for calling COM methods. --- dlls/fusion/Makefile.in | 1 + dlls/fusion/asmcache.c | 4 ++-- dlls/fusion/asmenum.c | 2 +- dlls/fusion/asmname.c | 2 +- dlls/fusion/tests/Makefile.in | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 63b1b73..2fe6492 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,5 +1,6 @@ MODULE = fusion.dll IMPORTS = advapi32 dbghelp shlwapi version user32 +EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asmcache.c \ diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 485a56c..9125655 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -165,7 +165,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryInterface(IAssemblyCache *iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCache)) { - IUnknown_AddRef(iface); + IAssemblyCache_AddRef(iface); *ppobj = This; return S_OK; } @@ -583,7 +583,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_QueryInterface(IAssemblyCacheItem * if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCacheItem)) { - IUnknown_AddRef(iface); + IAssemblyCacheItem_AddRef(iface); *ppobj = This; return S_OK; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 76a2bce..76de1bf 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -71,7 +71,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyEnum)) { - IUnknown_AddRef(iface); + IAssemblyEnum_AddRef(iface); *ppobj = This; return S_OK; } diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index d108a4d..78bc978 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -84,7 +84,7 @@ static HRESULT WINAPI IAssemblyNameImpl_QueryInterface(IAssemblyName *iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyName)) { - IUnknown_AddRef(iface); + IAssemblyName_AddRef(iface); *ppobj = This; return S_OK; } diff --git a/dlls/fusion/tests/Makefile.in b/dlls/fusion/tests/Makefile.in index 0542f0d..ac360bb 100644 --- a/dlls/fusion/tests/Makefile.in +++ b/dlls/fusion/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = fusion.dll IMPORTS = user32 +EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asmcache.c \

1 0

Michael Stefaniuc : winex11.drv: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 43b8858986c072c8d9552f806f7579d7512c3858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b8858986c072c8d9552f806… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 31 11:33:15 2012 +0200 winex11.drv: Avoid TRUE:FALSE conditional expressions. --- dlls/winex11.drv/opengl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4b32289..7ed3389 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1132,7 +1132,7 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex GLXContext ctx; /* We use indirect rendering for rendering to bitmaps. See get_formats for a comment about this. */ - BOOL indirect = (context->fmt->dwFlags & PFD_DRAW_TO_BITMAP) ? FALSE : TRUE; + BOOL indirect = !(context->fmt->dwFlags & PFD_DRAW_TO_BITMAP); if(context->gl3_context) { @@ -2424,12 +2424,12 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int case WGL_SUPPORT_GDI_ARB: if (!fmt) goto pix_error; - piValues[i] = (fmt->dwFlags & PFD_SUPPORT_GDI) ? TRUE : FALSE; + piValues[i] = (fmt->dwFlags & PFD_SUPPORT_GDI) != 0; continue; case WGL_DRAW_TO_BITMAP_ARB: if (!fmt) goto pix_error; - piValues[i] = (fmt->dwFlags & PFD_DRAW_TO_BITMAP) ? TRUE : FALSE; + piValues[i] = (fmt->dwFlags & PFD_DRAW_TO_BITMAP) != 0; continue; case WGL_DRAW_TO_WINDOW_ARB:

1 0

Jacek Caban : guiddef.h: Use static const IID instance for __uuidof.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: e6ad25fffe1b7567048f948676dd1197fa6fc49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ad25fffe1b7567048f94867… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 10:37:03 2012 +0200 guiddef.h: Use static const IID instance for __uuidof. --- include/guiddef.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 26b1ad7..b7de1b1 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -40,7 +40,8 @@ extern "C++" { #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ extern "C++" { \ template<> inline const GUID &__wine_uuidof<type>() { \ - return (const IID){l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8}}; \ + static const IID __uuid_inst = {l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8}}; \ + return __uuid_inst; \ } \ template<> inline const GUID &__wine_uuidof<type*>() { \ return __wine_uuidof<type>(); \

1 0

Nikolay Sivov : dwrite: Added basic test for IDWriteFont created from LOGFONTW.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: bd7db0a9a4af1c2d3d31cd80c47c1bb011b68da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7db0a9a4af1c2d3d31cd80c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 31 08:18:02 2012 +0400 dwrite: Added basic test for IDWriteFont created from LOGFONTW. --- configure | 3 +- configure.ac | 3 +- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/gdiinterop.c | 3 + dlls/dwrite/tests/Makefile.in | 7 +++ dlls/dwrite/tests/font.c | 100 +++++++++++++++++++++++++++++++++++++++++ include/dwrite.idl | 2 + 7 files changed, 118 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 512f7e4..e0984d2 100755 --- a/configure +++ b/configure @@ -15280,7 +15280,8 @@ wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave wine_fn_config_dll dwmapi enable_dwmapi implib -wine_fn_config_dll dwrite enable_dwrite +wine_fn_config_dll dwrite enable_dwrite implib +wine_fn_config_test dlls/dwrite/tests dwrite_test wine_fn_config_dll dxdiagn enable_dxdiagn po wine_fn_config_test dlls/dxdiagn/tests dxdiagn_test wine_fn_config_lib dxerr8 diff --git a/configure.ac b/configure.ac index 35c0e6c..4bd43d1 100644 --- a/configure.ac +++ b/configure.ac @@ -2624,7 +2624,8 @@ WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave) WINE_CONFIG_DLL(dwmapi,,[implib]) -WINE_CONFIG_DLL(dwrite) +WINE_CONFIG_DLL(dwrite,,[implib]) +WINE_CONFIG_TEST(dlls/dwrite/tests) WINE_CONFIG_DLL(dxdiagn,,[po]) WINE_CONFIG_TEST(dlls/dxdiagn/tests) WINE_CONFIG_LIB(dxerr8) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 7d88e77..03220d1 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,4 +1,5 @@ -MODULE = dwrite.dll +MODULE = dwrite.dll +IMPORTLIB = dwrite C_SRCS = \ gdiinterop.c \ diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 7b3c589..8215185 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -57,6 +57,9 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, LOGFONTW const *logfont, IDWriteFont **font) { FIXME("(%p %p): stub\n", logfont, font); + + if (!logfont) return E_INVALIDARG; + return E_NOTIMPL; } diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in new file mode 100644 index 0000000..f00d0e7 --- /dev/null +++ b/dlls/dwrite/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dwrite.dll +IMPORTS = dwrite + +C_SRCS = \ + font.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c new file mode 100644 index 0000000..fa345e3 --- /dev/null +++ b/dlls/dwrite/tests/font.c @@ -0,0 +1,100 @@ +/* + * Font related tests + * + * Copyright 2012 Nikolay Sivov 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 + */ + +#define COBJMACROS + +#include "windows.h" + +#include "initguid.h" +#include "dwrite.h" + +#include "wine/test.h" + +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + +IDWriteFactory *factory; + +static void test_CreateFontFromLOGFONT(void) +{ + static const WCHAR arialW[] = {'A','r','i','a','l',0}; + IDWriteGdiInterop *interop; + DWRITE_FONT_WEIGHT weight; + DWRITE_FONT_STYLE style; + IDWriteFont *font; + LOGFONTW logfont; + HRESULT hr; + BOOL ret; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + EXPECT_HR(hr, S_OK); + +if (0) + /* null out parameter crashes this call */ + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, NULL); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, &font); + EXPECT_HR(hr, E_INVALIDARG); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, arialW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine + EXPECT_HR(hr, S_OK); + +if (hr == S_OK) +{ + /* now check properties */ + weight = IDWriteFont_GetWeight(font); + ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); + + style = IDWriteFont_GetStyle(font); + ok(style == DWRITE_FONT_STYLE_ITALIC, "got %d\n", style); + + ret = IDWriteFont_IsSymbolFont(font); + ok(!ret, "got %d\n", ret); + + IDWriteFont_Release(font); +} + + IDWriteGdiInterop_Release(interop); +} + +START_TEST(font) +{ + HRESULT hr; + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr != S_OK) + { + win_skip("failed to create factory\n"); + return; + } + + test_CreateFontFromLOGFONT(); + + IDWriteFactory_Release(factory); +} diff --git a/include/dwrite.idl b/include/dwrite.idl index dc0e135..aff529a 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -1392,3 +1392,5 @@ interface IDWriteFactory : IUnknown FLOAT baseline_y, IDWriteGlyphRunAnalysis **analysis); } + +cpp_quote("HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE,REFIID,IUnknown**);")

1 0

Nikolay Sivov : dwrite: Added IDWriteGdiInterop stub.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 0ccdda1262c84c3bab7fb1136ac97c92faf30830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ccdda1262c84c3bab7fb1136… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 31 08:12:35 2012 +0400 dwrite: Added IDWriteGdiInterop stub. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/dwrite_private.h | 19 +++++++ dlls/dwrite/gdiinterop.c | 108 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 5 +- 4 files changed, 131 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 7438d92..7d88e77 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,6 +1,7 @@ MODULE = dwrite.dll C_SRCS = \ + gdiinterop.c \ main.c @MAKE_DLL_RULES@ diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h new file mode 100644 index 0000000..59ca09e --- /dev/null +++ b/dlls/dwrite/dwrite_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2012 Nikolay Sivov 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 + */ + +extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c new file mode 100644 index 0000000..7b3c589 --- /dev/null +++ b/dlls/dwrite/gdiinterop.c @@ -0,0 +1,108 @@ +/* + * GDI Interop + * + * Copyright 2012 Nikolay Sivov 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "dwrite.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + +static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop *iface, REFIID riid, void **obj) +{ + TRACE("(%s %p)\n", debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteGdiInterop)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI gdiinterop_AddRef(IDWriteGdiInterop *iface) +{ + return 2; +} + +static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop *iface) +{ + return 1; +} + +static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, + LOGFONTW const *logfont, IDWriteFont **font) +{ + FIXME("(%p %p): stub\n", logfont, font); + return E_NOTIMPL; +} + +static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, + IDWriteFont *font, LOGFONTW *logfont, BOOL *is_systemfont) +{ + FIXME("(%p %p %p): stub\n", font, logfont, is_systemfont); + return E_NOTIMPL; +} + +static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface, + IDWriteFontFace *font, LOGFONTW *logfont) +{ + FIXME("(%p %p): stub\n", font, logfont); + return E_NOTIMPL; +} + +static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, + HDC hdc, IDWriteFontFace **fontface) +{ + FIXME("(%p %p): stub\n", hdc, fontface); + return E_NOTIMPL; +} + +static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface, + HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) +{ + FIXME("(%p %u %u %p): stub\n", hdc, width, height, target); + return E_NOTIMPL; +} + +static const struct IDWriteGdiInteropVtbl gdiinteropvtbl = { + gdiinterop_QueryInterface, + gdiinterop_AddRef, + gdiinterop_Release, + gdiinterop_CreateFontFromLOGFONT, + gdiinterop_ConvertFontToLOGFONT, + gdiinterop_ConvertFontFaceToLOGFONT, + gdiinterop_CreateFontFaceFromHdc, + gdiinterop_CreateBitmapRenderTarget +}; + +static IDWriteGdiInterop gdiinterop = { &gdiinteropvtbl }; + +HRESULT create_gdiinterop(IDWriteGdiInterop **ret) +{ + *ret = &gdiinterop; + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index d3f8135..ca7de8e 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -26,6 +26,7 @@ #include "initguid.h" #include "dwrite.h" +#include "dwrite_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -168,8 +169,8 @@ static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory *iface, IDWr static HRESULT WINAPI dwritefactory_GetGdiInterop(IDWriteFactory *iface, IDWriteGdiInterop **gdi_interop) { - FIXME("(%p): stub\n", gdi_interop); - return E_NOTIMPL; + TRACE("(%p)\n", gdi_interop); + return create_gdiinterop(gdi_interop); } static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory *iface, WCHAR const* string,

1 0

Nikolay Sivov : dwrite: Stub for IDWriteFactory.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 370099e46c677215a7f021c428389142877cef6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=370099e46c677215a7f021c42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 31 08:07:49 2012 +0400 dwrite: Stub for IDWriteFactory. --- dlls/dwrite/main.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 211 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ed3b814..d3f8135 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "dwrite.h" #include "wine/debug.h" @@ -42,8 +43,216 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return TRUE; } -HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnknown **factory) +static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) +{ + TRACE("(%s %p)\n", debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDWriteFactory)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefactory_AddRef(IDWriteFactory *iface) +{ + return 2; +} + +static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI dwritefactory_GetSystemFontCollection(IDWriteFactory *iface, + IDWriteFontCollection **collection, BOOL check_for_updates) +{ + FIXME("(%p %d): stub\n", collection, check_for_updates); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *iface, + IDWriteFontCollectionLoader *loader, void const *key, UINT32 key_size, IDWriteFontCollection **collection) +{ + FIXME("(%p %p %u %p): stub\n", loader, key, key_size, collection); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory *iface, + IDWriteFontCollectionLoader *loader) +{ + FIXME("(%p): stub\n", loader); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactory *iface, + IDWriteFontCollectionLoader *loader) +{ + FIXME("(%p): stub\n", loader); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *iface, + WCHAR const *path, FILETIME const *writetime, IDWriteFontFile **font_file) +{ + FIXME("(%s %p %p): stub\n", debugstr_w(path), writetime, font_file); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *iface, + void const *reference_key, UINT32 key_size, IDWriteFontFileLoader *loader, IDWriteFontFile **font_file) +{ + FIXME("(%p %u %p %p): stub\n", reference_key, key_size, loader, font_file); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, + DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, + UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) +{ + FIXME("(%d %u %p %u 0x%x %p): stub\n", facetype, files_number, font_files, index, sim_flags, font_face); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params) +{ + FIXME("(%p): stub\n", params); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory *iface, HMONITOR monitor, + IDWriteRenderingParams **params) +{ + FIXME("(%p %p): stub\n", monitor, params); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory *iface, FLOAT gamma, FLOAT enhancedContrast, + FLOAT cleartype_level, DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams **params) +{ + FIXME("(%f %f %f %d %d %p): stub\n", gamma, enhancedContrast, cleartype_level, geometry, mode, params); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) +{ + FIXME("(%p): stub\n", loader); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) +{ + FIXME("(%p): stub\n", loader); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory *iface, WCHAR const* family_name, + IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, + DWRITE_FONT_STRETCH stretch, FLOAT size, WCHAR const *locale, IDWriteTextFormat **format) +{ + FIXME("(%s %p %d %d %d %f %s %p): stub\n", debugstr_w(family_name), collection, weight, style, stretch, + size, debugstr_w(locale), format); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory *iface, IDWriteTypography **typography) +{ + FIXME("(%p): stub\n", typography); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_GetGdiInterop(IDWriteFactory *iface, IDWriteGdiInterop **gdi_interop) +{ + FIXME("(%p): stub\n", gdi_interop); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory *iface, WCHAR const* string, + UINT32 len, IDWriteTextFormat *format, FLOAT max_width, FLOAT max_height, IDWriteTextLayout **layout) +{ + FIXME("(%s %u %p %f %f %p): stub\n", debugstr_w(string), len, format, max_width, max_height, layout); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory *iface, WCHAR const* string, + UINT32 len, IDWriteTextFormat *format, FLOAT layout_width, FLOAT layout_height, FLOAT pixels_per_dip, + DWRITE_MATRIX const* transform, BOOL use_gdi_natural, IDWriteTextLayout **layout) +{ + FIXME("(%s:%u %p %f %f %f %p %d %p): stub\n", debugstr_wn(string, len), len, format, layout_width, layout_height, + pixels_per_dip, transform, use_gdi_natural, layout); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory *iface, IDWriteTextFormat *format, + IDWriteInlineObject **trimming_sign) +{ + FIXME("(%p %p): stub\n", format, trimming_sign); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateTextAnalyzer(IDWriteFactory *iface, IDWriteTextAnalyzer **analyzer) +{ + FIXME("(%p): stub\n", analyzer); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefactory_CreateNumberSubstitution(IDWriteFactory *iface, DWRITE_NUMBER_SUBSTITUTION_METHOD method, + WCHAR const* locale, BOOL ignore_user_override, IDWriteNumberSubstitution **substitution) { - FIXME("(%d, %s, %p): stub\n", type, debugstr_guid(riid), factory); + FIXME("(%d %s %d %p): stub\n", method, debugstr_w(locale), ignore_user_override, substitution); return E_NOTIMPL; } + +static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory *iface, DWRITE_GLYPH_RUN const *glyph_run, + FLOAT pixels_per_dip, DWRITE_MATRIX const* transform, DWRITE_RENDERING_MODE rendering_mode, + DWRITE_MEASURING_MODE measuring_mode, FLOAT baseline_x, FLOAT baseline_y, IDWriteGlyphRunAnalysis **analysis) +{ + FIXME("(%p %f %p %d %d %f %f %p): stub\n", glyph_run, pixels_per_dip, transform, rendering_mode, + measuring_mode, baseline_x, baseline_y, analysis); + return E_NOTIMPL; +} + +static const struct IDWriteFactoryVtbl dwritefactoryvtbl = { + dwritefactory_QueryInterface, + dwritefactory_AddRef, + dwritefactory_Release, + dwritefactory_GetSystemFontCollection, + dwritefactory_CreateCustomFontCollection, + dwritefactory_RegisterFontCollectionLoader, + dwritefactory_UnregisterFontCollectionLoader, + dwritefactory_CreateFontFileReference, + dwritefactory_CreateCustomFontFileReference, + dwritefactory_CreateFontFace, + dwritefactory_CreateRenderingParams, + dwritefactory_CreateMonitorRenderingParams, + dwritefactory_CreateCustomRenderingParams, + dwritefactory_RegisterFontFileLoader, + dwritefactory_UnregisterFontFileLoader, + dwritefactory_CreateTextFormat, + dwritefactory_CreateTypography, + dwritefactory_GetGdiInterop, + dwritefactory_CreateTextLayout, + dwritefactory_CreateGdiCompatibleTextLayout, + dwritefactory_CreateEllipsisTrimmingSign, + dwritefactory_CreateTextAnalyzer, + dwritefactory_CreateNumberSubstitution, + dwritefactory_CreateGlyphRunAnalysis +}; + +static IDWriteFactory dwritefactory = { &dwritefactoryvtbl }; + +HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnknown **factory) +{ + TRACE("(%d, %s, %p)\n", type, debugstr_guid(riid), factory); + + if (!IsEqualIID(riid, &IID_IDWriteFactory)) return E_FAIL; + + *factory = (IUnknown*)&dwritefactory; + + return S_OK; +}

1 0

Hans Leidekker : sxs: Use inline wrappers for calling COM methods.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: f3069333a4f41a457362d0303d8eb562972a4b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3069333a4f41a457362d0303… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 31 12:25:08 2012 +0200 sxs: Use inline wrappers for calling COM methods. --- dlls/sxs/Makefile.in | 1 + dlls/sxs/cache.c | 2 +- dlls/sxs/name.c | 2 +- dlls/sxs/tests/Makefile.in | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index d6d6f2b..a107928 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,6 +1,7 @@ MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs +EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cache.c \ diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 46686e5..791a6ed 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -69,7 +69,7 @@ static HRESULT WINAPI cache_QueryInterface( if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCache)) { - IUnknown_AddRef( iface ); + IAssemblyCache_AddRef( iface ); *obj = cache; return S_OK; } diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 9ca911b..bb7f094 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -68,7 +68,7 @@ static HRESULT WINAPI name_QueryInterface( if (IsEqualIID( riid, &IID_IUnknown ) || IsEqualIID( riid, &IID_IAssemblyName )) { - IUnknown_AddRef( iface ); + IAssemblyName_AddRef( iface ); *obj = name; return S_OK; } diff --git a/dlls/sxs/tests/Makefile.in b/dlls/sxs/tests/Makefile.in index 2f8be9c..69305ae 100644 --- a/dlls/sxs/tests/Makefile.in +++ b/dlls/sxs/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = sxs.dll IMPORTS = sxs +EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cache.c \

1 0

Michael Stefaniuc : mapi32: Remove superfluous TRUE: FALSE conditional expressions.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 6740d340c6042f27aa27891aa21ef1b4ed6ba16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6740d340c6042f27aa27891aa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 31 11:31:06 2012 +0200 mapi32: Remove superfluous TRUE:FALSE conditional expressions. --- dlls/mapi32/prop.c | 12 ++++++------ dlls/mapi32/util.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 8b40e1d..a623424 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -417,12 +417,12 @@ BOOL WINAPI FPropCompareProp(LPSPropValue lpPropLeft, ULONG ulOp, LPSPropValue l switch (ulOp) { - case RELOP_LT: return iCmp < 0 ? TRUE : FALSE; - case RELOP_LE: return iCmp <= 0 ? TRUE : FALSE; - case RELOP_GT: return iCmp > 0 ? TRUE : FALSE; - case RELOP_GE: return iCmp >= 0 ? TRUE : FALSE; - case RELOP_EQ: return iCmp == 0 ? TRUE : FALSE; - case RELOP_NE: return iCmp != 0 ? TRUE : FALSE; + case RELOP_LT: return iCmp < 0; + case RELOP_LE: return iCmp <= 0; + case RELOP_GT: return iCmp > 0; + case RELOP_GE: return iCmp >= 0; + case RELOP_EQ: return iCmp == 0; + case RELOP_NE: return iCmp != 0; } return FALSE; } diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index abc4db6..2b1957c 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -488,7 +488,7 @@ BOOL WINAPI FEqualNames(LPMAPINAMEID lpName1, LPMAPINAMEID lpName2) if (lpName1->ulKind == MNID_STRING) return !strcmpW(lpName1->Kind.lpwstrName, lpName2->Kind.lpwstrName); - return lpName1->Kind.lID == lpName2->Kind.lID ? TRUE : FALSE; + return lpName1->Kind.lID == lpName2->Kind.lID; } /**************************************************************************

1 0