Changeset 552 for trunk/dll/systemf.c

Timestamp:

Mar 1, 2007, 7:24:47 AM (18 years ago)

Author:

Gregg Young

Message:

font cleanup; new image and archiver masks; messages moved to string file; new drive flags including David's icons mostly working

File:

• trunk/dll/systemf.c (modified) (6 diffs)

trunk/dll/systemf.c

@@ -17 +17 @@
   01 Nov 06 SHL runemf2: temp fix for hung windows caused by termq errors
   03 Nov 06 SHL runemf2: rework termination queue logic to work for multiple threads
+  07 Jan 07 GKY Move error strings etc. to string file
 
 ***********************************************************************/
@@ -782 +783 @@
           switch_to(szSavedir);
         if (rc) {
-          // fixme to be in fm2dll.str
-          Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,"DosQAppType failed for %s.", pszPgm);
+          Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,
+                    GetPString(IDS_DOSQAPPTYPEFAILEDTEXT),
+                    pszPgm);
           DosFreeMem(pszPgm);
           if (pszArgs)
@@ -793 +795 @@
               (apptype & FAPPTYP_PHYSDRV) || (apptype & FAPPTYP_PROTDLL))
           {
-            // fixme to be in fm2dll.str
-            Runtime_Error(pszSrcFile, __LINE__, "apptype 0x%x unexpected for %s.", apptype, pszPgm);
+            Runtime_Error(pszSrcFile, __LINE__,
+                          GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
+                          apptype, pszPgm);
             if (pszPgm)
               DosFreeMem(pszPgm);
@@ -804 +807 @@
               (apptype & FAPPTYP_WINDOWSPROT) || (apptype & 0x1000))
           {
-            Runtime_Error(pszSrcFile, __LINE__, "apptype 0x%x unexpected for %s.", apptype, pszPgm);
+            Runtime_Error(pszSrcFile, __LINE__,
+                          GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
+                          apptype, pszPgm);
             if (pszPgm)
               DosFreeMem(pszPgm);
@@ -914 +919 @@
         switch_to(szSavedir);
       if (rc) {
-        // fixme to be in fm2dll.str
-        Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,"DosQAppType failed for %s.", pszPgm);
+        Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,
+                  GetPString(IDS_DOSQAPPTYPEFAILEDTEXT),
+                  pszPgm);
         DosFreeMem(pszPgm);
         if (pszArgs)
@@ -925 +931 @@
         if (apptype & (FAPPTYP_DLL | FAPPTYP_VIRTDRV | FAPPTYP_PHYSDRV | FAPPTYP_PROTDLL))
         {
-          // fixme to be in fm2dll.str
-          Runtime_Error(pszSrcFile, __LINE__, "apptype %d unexpected for %s.", pszPgm);
+          Runtime_Error(pszSrcFile, __LINE__,
+                        GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
+                        pszPgm);
           DosFreeMem(pszPgm);
           if (pszArgs)