dwrite: Test simulations mask bitwise for consistency.

This has no functional impact. Internal function is only called with one bit set at a time, but there is no reason to make it more confusing. Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Test simulations mask bitwise for consistency.
d871f04b · Nikolay Sivov · Alexandre Julliard · c5c4e833 · d871f04b
Commit d871f04b authored Mar 15, 2021 by Nikolay Sivov Committed by Alexandre Julliard Mar 15, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

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

No files found.
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -4022,7 +4022,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo
    return S_OK;
 }

-static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS sim,
+static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS simulations,
        const WCHAR *facenameW, struct dwrite_font_data **ret)
 {
    struct dwrite_font_data *data;
@@ -4035,10 +4035,10 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI

    *data = *src;
    data->refcount = 1;
-    data->simulations |= sim;
-    if (sim == DWRITE_FONT_SIMULATIONS_BOLD)
+    data->simulations |= simulations;
+    if (simulations & DWRITE_FONT_SIMULATIONS_BOLD)
        data->weight = DWRITE_FONT_WEIGHT_BOLD;
-    else if (sim == DWRITE_FONT_SIMULATIONS_OBLIQUE)
+    if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE)
        data->style = DWRITE_FONT_STYLE_OBLIQUE;
    memset(data->info_strings, 0, sizeof(data->info_strings));
    data->names = NULL;