Changeset 91 for trunk/src/helpers/gpih.c

Timestamp:

Aug 2, 2001, 10:36:35 PM (24 years ago)

Author:

umoeller

Message:

Misc changes

File:

• trunk/src/helpers/gpih.c (modified) (14 diffs)

trunk/src/helpers/gpih.c

@@ -603 +603 @@
  *
  *      gpihFindFont uses this mutex. If you call GpiCreateLogFont
- *      yourself somewhere, do this after you called this function.
+ *      yourself somewhere, you should do this under the protection
+ *      of this function.
  *
  *      Call gpihUnlockLCIDs to unlock.
@@ -612 +613 @@
 BOOL gpihLockLCIDs(VOID)
 {
-    BOOL brc = FALSE;
-
-    if (G_hmtxLCIDs == NULLHANDLE)
+    if (!G_hmtxLCIDs)
         // first call: create
-        brc = !DosCreateMutexSem(NULL,
-                                 &G_hmtxLCIDs,
-                                 0,
-                                 TRUE);     // request!
-    else
-        // subsequent calls: request
-        brc = !WinRequestMutexSem(G_hmtxLCIDs, SEM_INDEFINITE_WAIT);
-
-    return (brc);
+        return (!DosCreateMutexSem(NULL,
+                                   &G_hmtxLCIDs,
+                                   0,
+                                   TRUE));     // request!
+
+    // subsequent calls: request
+    return (!WinRequestMutexSem(G_hmtxLCIDs, SEM_INDEFINITE_WAIT));
 }
 
@@ -741 +738 @@
         if (allcids)
             free(allcids);
-
-/*
-        PLONG   pBase;
-        APIRET  arc;
-
-        // _Pmpf(("gpihQueryNextFontID: calling DosAllocMem"));
-
-        arc = DosAllocMem((PPVOID)(&pBase),
-                          GQNCL_BLOCK_SIZE,
-                                   // space is needed for an array of lCount longs.
-                          PAG_READ |
-                          PAG_WRITE);
-        if (arc == NO_ERROR)
-        {
-            arc = DosSubSetMem(pBase,
-                               DOSSUB_INIT | DOSSUB_SPARSE_OBJ,
-                               GQNCL_BLOCK_SIZE);
-            if (arc == NO_ERROR)
-            {
-                PLONG  alTypes;  // object types
-                PSTR8  aNames;   // font names
-                PLONG  allcids;  // local identifiers
-
-                arc = DosSubAllocMem((PVOID)pBase,
-                                     (PPVOID)(&aNames),
-                                     (ULONG)(lCount*(ULONG)sizeof(STR8)));
-                                             // space is needed for an array of
-                                             // lCount longs
-                if (arc == NO_ERROR)
-                {
-                    arc = DosSubAllocMem((PVOID)pBase,
-                                             (PPVOID)(&allcids),
-                                             (ULONG)lCount*sizeof(LONG));
-                                                // space is needed for an array of
-                                                // lCount longs.
-                    if (arc == NO_ERROR)
-                    {
-                        arc = DosSubAllocMem((PVOID)pBase,
-                                                 (PPVOID)(&alTypes),
-                                                 (ULONG)lCount*sizeof(LONG));
-                                                    // space is needed for an array of
-                                                    // lCount longs.
-                        if (arc == NO_ERROR)
-                        {
-                            if (GpiQuerySetIds(hps,
-                                               lCount,
-                                               alTypes,
-                                               aNames,
-                                               allcids))
-                            {
-                                // FINALLY we have all the lcids in use.
-                                BOOL    fContinue = TRUE;
-                                lcidNext = 1;
-
-                                // now, check if this lcid is in use already:
-                                while (fContinue)
-                                {
-                                    BOOL fFound = FALSE;
-                                    ULONG ul;
-                                    fContinue = FALSE;
-                                    for (ul = 0;
-                                         ul < lCount;
-                                         ul++)
-                                    {
-                                        if (allcids[ul] == lcidNext)
-                                        {
-                                            fFound = TRUE;
-                                            break;
-                                        }
-                                    }
-
-                                    if (fFound)
-                                    {
-                                        // lcid found:
-                                        // try next higher one
-                                        lcidNext++;
-                                        fContinue = TRUE;
-                                    }
-                                    // else: return that one
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            arc = DosFreeMem(pBase);
-        }
-        */
     }
 
@@ -1006 +914 @@
  *@@changed V0.9.4 (2000-08-08) [umoeller]: added fFamily
  *@@changed V0.9.9 (2001-04-01) [umoeller]: made this thread-safe, finally
+ *@@changed V0.9.14 (2001-08-01) [umoeller]: some optimizations
  */
 
@@ -1012 +921 @@
                   BOOL fFamily,          // in: if TRUE, pszName specifies font family;
                                          //     if FALSE, pszName specifies font face
-                  PSZ pszName,           // in: font family or face name (without point size)
+                  const char *pcszName,  // in: font family or face name (without point size)
                   USHORT usFormat,       // in: none, one or several of:
                                          // -- FATTR_SEL_ITALIC
@@ -1034 +943 @@
                                    sizeof(FONTMETRICS),
                                    NULL);
-    PFONTMETRICS pfm = (PFONTMETRICS)malloc(cFonts * sizeof(FONTMETRICS)),
-                 pfm2 = pfm,
-                 pfmFound = NULL;
+    PFONTMETRICS    pfm = (PFONTMETRICS)malloc(cFonts * sizeof(FONTMETRICS)),
+                    pfm2 = pfm,
+                    pfmFound = NULL;
+
+    BOOL            fQueriedDevice = FALSE;     // V0.9.14 (2001-08-01) [umoeller]
+    LONG            alDevRes[2];            // device resolution
 
     // _Pmpf(("gpihFindFont: enumerating for %s, %d points", pszFaceName, lSize));
@@ -1047 +959 @@
                                             // -- _not_ total buffer size!
                   pfm);
+
     // now we have an array of FONTMETRICS
     // for EVERY font that is installed on the system...
@@ -1066 +979 @@
     FontAttrs.fsSelection = usFormat; // changed later if better font is found
     FontAttrs.lMatch = 0L;             // closest match
-    strcpy(FontAttrs.szFacename, pszName);
+    strcpy(FontAttrs.szFacename, pcszName);
     FontAttrs.idRegistry = 0;          // default registry
     FontAttrs.usCodePage = 0;          // default codepage
@@ -1095 +1008 @@
                pfm2->lAveCharWidth)); */
 
-        PSZ pszCompare = (fFamily)
-                              ? pfm2->szFamilyname
-                              : pfm2->szFacename;
-
-        if (strcmp(pszCompare, pszName) == 0)
+        const char *pcszCompare = (fFamily)
+                                     ? pfm2->szFamilyname
+                                     : pfm2->szFacename;
+
+        if (!strcmp(pcszCompare, pcszName))
         {
             /* _Pmpf(("  Found font %s; slope %d, usWeightClass %d",
@@ -1117 +1030 @@
                     // for bitmap fonts, there are always two versions:
                     // one for low resolutions, one for high resolutions
-                    LONG    alDevRes[2];
-                    DevQueryCaps(GpiQueryDevice(hps),
-                                 CAPS_HORIZONTAL_FONT_RES,
-                                 2L,
-                                 alDevRes);
+                    if (!fQueriedDevice)
+                    {
+                        DevQueryCaps(GpiQueryDevice(hps),
+                                     CAPS_HORIZONTAL_FONT_RES,
+                                     2L,
+                                     alDevRes);
+                        fQueriedDevice = TRUE;
+                    }
+
                     if (    (pfm2->sXDeviceRes == alDevRes[0])
                          && (pfm2->sYDeviceRes == alDevRes[1])
@@ -1151 +1068 @@
                                  && (pfm2->usWeightClass == 7) // bold
                                 )
-                            ||  (   ((usFormat & FATTR_SEL_BOLD) == 0)
+                            ||  (   (!(usFormat & FATTR_SEL_BOLD))
                                  && (pfm2->usWeightClass == 5) // regular
                                 )
@@ -1158 +1075 @@
                                  && (pfm2->sCharSlope != 0) // italics
                                 )
-                            ||  (   ((usFormat & FATTR_SEL_ITALIC) == 0)
+                            ||  (   (!(usFormat & FATTR_SEL_ITALIC))
                                  && (pfm2->sCharSlope == 0) // regular
                                 )
@@ -2075 +1992 @@
  *      You can then use any GPI function on the memory
  *      PS to draw into the bitmap. Use the fields from
- *      _XBITMAP for that.
+ *      XBITMAP for that.
  *
  *      The bitmap is created in RGB mode.
@@ -2144 +2061 @@
  *
  *      To be on the safe side, this sets the
- *      bitmap pointer to NULL as well.
+ *      given XBITMAP pointer to NULL as well.
  *
  *@@added V0.9.12 (2001-05-20) [umoeller]