[PATCH 08/21] dlls/gdi32: Use FIXME_ONCE

David Kahurani k.kahurani at gmail.com
Fri Oct 15 10:35:39 CDT 2021


introduce FIXME_ONCE

Signed-off-by: David Kahurani <k.kahurani at gmail.com>
---
 dlls/gdi32/uniscribe/opentype.c | 21 +++++----------------
 dlls/gdi32/uniscribe/usp10.c    |  6 ++----
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/dlls/gdi32/uniscribe/opentype.c b/dlls/gdi32/uniscribe/opentype.c
index a7a81ac..61d4d20 100644
--- a/dlls/gdi32/uniscribe/opentype.c
+++ b/dlls/gdi32/uniscribe/opentype.c
@@ -1257,9 +1257,7 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo
         ccsf1 = (const GSUB_ChainContextSubstFormat1*)GSUB_get_subtable(look, j);
         if (GET_BE_WORD(ccsf1->SubstFormat) == 1)
         {
-            static int once;
-            if (!once++)
-                FIXME("  TODO: subtype 1 (Simple context glyph substitution)\n");
+	    FIXME_ONCE("  TODO: subtype 1 (Simple context glyph substitution)\n");
             continue;
         }
         else if (GET_BE_WORD(ccsf1->SubstFormat) == 2)
@@ -2155,10 +2153,7 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const
 
         if (GET_BE_WORD(cpf2->PosFormat) == 1)
         {
-            static int once;
-            if (!once++)
-                FIXME("  TODO: subtype 1\n");
-            continue;
+            FIXME_ONCE("  TODO: subtype 1\n");
         }
         else if (GET_BE_WORD(cpf2->PosFormat) == 2)
         {
@@ -2247,9 +2242,7 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const
         }
         else if (GET_BE_WORD(cpf2->PosFormat) == 3)
         {
-            static int once;
-            if (!once++)
-                FIXME("  TODO: subtype 3\n");
+            FIXME_ONCE("  TODO: subtype 3\n");
             continue;
         }
         else
@@ -2277,16 +2270,12 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache,
 
         if (GET_BE_WORD(backtrack->PosFormat) == 1)
         {
-            static int once;
-            if (!once++)
-                FIXME("  TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n");
+            FIXME_ONCE("  TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n");
             continue;
         }
         else if (GET_BE_WORD(backtrack->PosFormat) == 2)
         {
-            static int once;
-            if (!once++)
-                FIXME("  TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n");
+            FIXME_ONCE("  TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n");
             continue;
         }
         else if (GET_BE_WORD(backtrack->PosFormat) == 3)
diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c
index cceb9dc..8d82e93 100644
--- a/dlls/gdi32/uniscribe/usp10.c
+++ b/dlls/gdi32/uniscribe/usp10.c
@@ -3059,7 +3059,6 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc,
     unsigned int g;
     BOOL rtl;
     int cluster;
-    static int once = 0;
 
     TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %d, %d, %p, %p, %p, %p, %p )\n",
      hdc, psc, psa,
@@ -3074,7 +3073,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc,
     if (cChars > cMaxGlyphs) return E_OUTOFMEMORY;
 
     if (cRanges)
-        if(!once++) FIXME("Ranges not supported yet\n");
+        FIXME_ONCE("Ranges not supported yet\n");
 
     rtl = (psa && !psa->fLogicalOrder && psa->fRTL);
 
@@ -3320,7 +3319,6 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS
 {
     HRESULT hr;
     int i;
-    static int once = 0;
 
     TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %p, %p, %d, %p, %p, %d, %p %p %p)\n",
      hdc, psc, psa,
@@ -3334,7 +3332,7 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS
     if (!pGoffset) return E_FAIL;
 
     if (cRanges)
-        if (!once++) FIXME("Ranges not supported yet\n");
+        FIXME_ONCE("Ranges not supported yet\n");
 
     ((ScriptCache *)*psc)->userScript = tagScript;
     ((ScriptCache *)*psc)->userLang = tagLangSys;
-- 
2.33.0




More information about the wine-devel mailing list