Changeset 1394 for trunk/dll/fonts.c

Timestamp:

Feb 5, 2009, 5:17:25 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 340: Convert GetPString to use STRINGTABLE.

Drop fm3dll.str and mkstr.exe from makefiles and wpi builders

Convert many functions to expect PCSZ arguments.
Correct walk, compare and dirsizes dialog setups to ignore saved dialog size
Drop copyright.c logic from makefile

File:

• trunk/dll/fonts.c (modified) (10 diffs)

trunk/dll/fonts.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2008 Steven H. Levine
+  Copyright (c) 2008, 2009 Steven H. Levine
 
   05 Jan 08 SHL Sync
@@ -76 +76 @@
 
 VOID SetPresParamFromFattrs(HWND hwnd, FATTRS * fattrs,
-                            SHORT sNominalPointSize, FIXED fxPointSize)
+                            SHORT sNominalPointSize, FIXED fxPointSize)
 {
 
@@ -87 +87 @@
     if ((((USHORT) FIXEDFRAC(fxPointSize) * 100) / 65536) > 0)
       sprintf(&s[strlen(s)], "%hd.",
-              ((USHORT) FIXEDFRAC(fxPointSize) * 100) / 65536);
+              ((USHORT) FIXEDFRAC(fxPointSize) * 100) / 65536);
   }
   strcat(s, fattrs->szFacename);
@@ -125 +125 @@
   //DosEnterCritSec(); //GKY 11-30-08
   DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
-  szPreview = GetPString(IDS_BLURB1TEXT);
+  szPreview = GetPString(IDS_BLURB1TEXT + counter++);
+  if (strcmp(szPreview, "0") == 0) {
+    counter = 0;
+    szPreview = GetPString(IDS_BLURB1TEXT + counter++);
+  }
   DosReleaseMutexSem(hmtxFM2Globals);
   //DosExitCritSec();
@@ -157 +161 @@
   WinReleasePS(fontdlg.hpsScreen);
   SetPresParamFromFattrs(hwnd, &fontdlg.fAttrs, fontdlg.sNominalPointSize,
-                         fontdlg.fxPointSize);
+                         fontdlg.fxPointSize);
 }
 #endif
@@ -177 +181 @@
   HPS hps;
   FONTMETRICS fontMetrics;
-  CHAR szFamily[CCHMAXPATH], *szPreview;
+  CHAR szFamily[CCHMAXPATH];
+  PCSZ pcszPreview;
   static FIXED fxPointSize = 0; /* keep track of this for vector fonts */
 
@@ -184 +189 @@
   //DosEnterCritSec(); //GKY 11-30-08
   DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
-  szPreview = GetPString(IDS_BLURB1TEXT);
+  // 12 Jan 09 SHL fixme to do multiple previews or rename to IDS_BLURBTEXT
+  pcszPreview = GetPString(IDS_BLURB1TEXT);
   DosReleaseMutexSem(hmtxFM2Globals);
   //DosExitCritSec();
@@ -194 +200 @@
   if (!(flags & 1))
     WinSendMsg(hwndMLE, MLM_QUERYFONT,
-               MPFROMP((PFATTRS) & (fontDlg.fAttrs)), NULL);
+               MPFROMP((PFATTRS) & (fontDlg.fAttrs)), NULL);
   else
     memcpy(&fontDlg.fAttrs, fattrs, sizeof(FATTRS));
@@ -201 +207 @@
 
   GpiCreateLogFont(hps, (PSTR8) fontDlg.fAttrs.szFacename, 1,
-                   &(fontDlg.fAttrs));
+                   &(fontDlg.fAttrs));
   GpiSetCharSet(hps, 1);
   GpiQueryFontMetrics(hps, sizeof(FONTMETRICS), &fontMetrics);
@@ -215 +221 @@
   fontDlg.hpsPrinter = NULLHANDLE;      /* Printer presentation space */
 
-  fontDlg.pszTitle = GetPString(IDS_SETVIEWERFONTTITLETEXT);
-  fontDlg.pszPreview = szPreview;
+  fontDlg.pszTitle = (PSZ)GetPString(IDS_SETVIEWERFONTTITLETEXT);
+  fontDlg.pszPreview = (PSZ)pcszPreview;
   fontDlg.pszPtSizeList = NULL;         /* Application provided size list  */
   fontDlg.pfnDlgProc = NULL;            /* Dialog subclass procedure       */