Module: wine
Branch: master
Commit: 6f5436f9f4b0bbb664d9ac3b78a634ccb33230bf
URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6f5436f9f4b0bbb664d9ac3b…
Author: Michael Stefaniuc <mstefani(a)winehq.org>
Date: Thu Feb 28 00:50:27 2019 +0100
dwrite: Remove useless casts to self.
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/dwrite/font.c | 2 +-
dlls/dwrite/layout.c | 4 ++--
dlls/dwrite/opentype.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index 948c1df..3742366 100644
--- 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)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index de79fd4..4cd5ce4 100644
--- 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:
;
diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index b13f424..4772236 100644
--- 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
{