From 3cbd598e814f9187d3a847e8b61820ac3b3bd3a1 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Mon, 2 Oct 2017 10:47:01 +0300 Subject: [PATCH] usp10: Remove separate invalid flag from string analysis structure. Signed-off-by: Nikolay Sivov Signed-off-by: Aric Stewart Signed-off-by: Alexandre Julliard --- dlls/usp10/usp10.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 57692403c95..0b8c28e6148 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -690,14 +690,14 @@ typedef struct { enum stringanalysis_flags { - SCRIPT_STRING_ANALYSIS_FLAGS_SIZE = 0x1, + SCRIPT_STRING_ANALYSIS_FLAGS_SIZE = 0x1, + SCRIPT_STRING_ANALYSIS_FLAGS_INVALID = 0x2, }; typedef struct { HDC hdc; DWORD ssa_flags; DWORD flags; - BOOL invalid; int clip_len; int cItems; int cMaxGlyphs; @@ -2367,7 +2367,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai /* icp out of range */ if(icp < 0) { - analysis->invalid = TRUE; + analysis->flags |= SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; return E_INVALIDARG; } @@ -2408,7 +2408,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai } /* icp out of range */ - analysis->invalid = TRUE; + analysis->flags |= SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; return E_INVALIDARG; } @@ -2508,7 +2508,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) if (!pssa || !(analysis = *pssa)) return E_INVALIDARG; - invalid = analysis->invalid; + invalid = analysis->flags & SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; if (analysis->glyphs) { @@ -3800,7 +3800,7 @@ HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return E_INVALIDARG; - return (analysis->invalid) ? S_FALSE : S_OK; + return analysis->flags & SCRIPT_STRING_ANALYSIS_FLAGS_INVALID ? S_FALSE : S_OK; } /*********************************************************************** -- 2.11.4.GIT