dwrite: Remove useless casts to self.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Remove useless casts to self.
6f5436f9 · Michael Stefaniuc · Alexandre Julliard · b3a464a8 · 6f5436f9 · 6f5436f9
Commit 6f5436f9 authored Feb 28, 2019 by Michael Stefaniuc Committed by Alexandre Julliard Mar 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

font.c dlls/dwrite/font.c +1 -1

layout.c dlls/dwrite/layout.c +2 -2

opentype.c dlls/dwrite/opentype.c +1 -1

No files found.
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -2420,7 +2420,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3
 BOOL is_system_collection(IDWriteFontCollection *collection)
 {
    void *obj;
-    return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK;
+    return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, &obj) == S_OK;
 }

 static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj)

--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -2520,7 +2520,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_
        changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object);
        break;
    case LAYOUT_RANGE_ATTR_EFFECT:
-        changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect);
+        changed = set_layout_range_iface_attr(&dest_iface->iface, value->u.effect);
        break;
    case LAYOUT_RANGE_ATTR_UNDERLINE:
        changed = dest_bool->value != value->u.underline;
@@ -2560,7 +2560,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_
        dest_spacing->min_advance = value->u.spacing.min_advance;
        break;
    case LAYOUT_RANGE_ATTR_TYPOGRAPHY:
-        changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.typography);
+        changed = set_layout_range_iface_attr(&dest_iface->iface, (IUnknown*)value->u.typography);
        break;
    default:
        ;

--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -538,7 +538,7 @@ struct ot_lookup_table
    WORD subtable[1];
 };

-#define GLYPH_NOT_COVERED ((unsigned int)~0u)
+#define GLYPH_NOT_COVERED (~0u)

 struct ot_coverage_format1
 {