Changeset 1891 for trunk/dll/init.c

Timestamp:

Jan 31, 2020, 3:47:37 AM (6 years ago)

Author:

Steven Levine

Message:

Rework FreeCnrItem to ensure all CNRITEMs deleted.
Use WinSendMsg CMA_NEXT.
Was using preccNextRecord which is not recommended because control does
not maintain linkage after inserts and deletes.
Note: arccnrs.c still needs to be reworked to use common functions from filldir.c.

File:

• trunk/dll/init.c (modified) (9 diffs)

trunk/dll/init.c

@@ -218 +218 @@
 #include "systemf.h"                    // runemf2
 
-#if 0
-#define  __PMPRINTF__
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif
@@ -748 +748 @@
   }
 
-#if 0
+#ifdef PMPRINTF
   PmPrintfDisplayInterfaceVersionInfo();
   PmPrintfQueueNameThisProcess(NULL);
@@ -940 +940 @@
         strcpy(inipath, profile);
       }
-    } //fixme the DosCopies probably fail if the INI isn't in the FM2 directory GKY 06 Aug 11
+    } // FIXME the DosCopies probably fail if the INI isn't in the FM2 directory GKY 06 Aug 11
     if (!*inipath)
       strcpy(inipath, profile);
@@ -953 +953 @@
         fWantFirstTimeInit = TRUE;
     }
-    if (!fWantFirstTimeInit) { //Check the ini file header and restore from backup if corupted
+    if (!fWantFirstTimeInit) {
+      // Check the ini file header and restore from backup if corupted
       if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
         saymsg(MB_ENTER,HWND_DESKTOP, GetPString(IDS_DEBUG_STRING),
@@ -984 +985 @@
     }
 
-    // 10 Jan 08 SHL fixme to do first time if new ini
+    // 10 Jan 08 SHL FIXME to do first time if new ini
     // 10 Jan 08 SHL post UM_FIRSTTIME to main window
     if (!fmprof) {
@@ -1225 +1226 @@
   prntabspaces = 8;
   CollectorsortFlags = sortFlags = SORT_FILENAME | SORT_DIRSFIRST;
-  //Get default Country info
+  // Get default Country info
   {
     COUNTRYCODE Country    = {0};
@@ -1261 +1262 @@
       fLVM = TRUE;
 
-    //Check for unlock.exe
+    // Check for unlock.exe
     if (!xDosQueryAppType(PCSZ_UNLOCKEXE, &ulAppType))
       fUnlock = TRUE;
@@ -1324 +1325 @@
   editor = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!editor)
-    return 0; //already complained
+    return 0; // already complained
   viewer = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!viewer)
-    return 0; //already complained
+    return 0; // already complained
   virus = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!virus)
-    return 0; //already complained
+    return 0; // already complained
   compare = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!compare)
-    return 0; //already complained
+    return 0; // already complained
   binview = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!binview)
-    return 0; //already complained
+    return 0; // already complained
   bined = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!bined)
-    return 0; //already complained
+    return 0; // already complained
   dircompare = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!dircompare)
-    return 0; //already complained
+    return 0; // already complained
   ftprun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!ftprun)
-    return 0; //already complained
+    return 0; // already complained
   httprun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!httprun)
-    return 0; //already complained
+    return 0; // already complained
   mailrun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!mailrun)
-    return 0; //already complained
+    return 0; // already complained
   pszTreeEnvVarList = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!pszTreeEnvVarList)
-    return 0; //already complained
+    return 0; // already complained
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "DontSuggestAgain", &fDontSuggestAgain, &size);
@@ -1803 +1804 @@
   int ok = 0;
 
-  // fixme to do useful check - was missing in base source
+  // FIXME to do useful check - was missing in base source
 
 #if 0