Changeset 1521

Timestamp:

May 2, 2010, 11:48:59 PM (15 years ago)

Author:

Gregg Young

Message:

Minor code clean up mostly remming or removal of DbgMsgs; comments

Location:

trunk/dll

Files:

• assoc.c (modified) (1 diff)
• command.c (modified) (3 diffs)
• dircnrs.c (modified) (1 diff)
• draglist.c (modified) (2 diffs)
• notify.c (modified) (1 diff)
• systemf.h (modified) (1 diff)
• tmrsvcs.c (modified) (1 diff)

trunk/dll/assoc.c

@@ -529 +529 @@
           dieafter = TRUE;
         flags &= (~DIEAFTER);
-        DbgMsg(pszSrcFile, __LINE__, "env %s", info->env);
+        //DbgMsg(pszSrcFile, __LINE__, "env %s", info->env);
         rc = ExecOnList(hwnd,
                         info->pszCmdLine,

trunk/dll/command.c

@@ -382 +382 @@
   size = sizeof(BOOL) * 40;
   PrfQueryProfileData(fmprof, FM3Str, "COMMANDS.UsedHotKeyIDs", &UsedHotKeyIDs,
-                        &size); size = sizeof(BOOL);
+                      &size);
+  size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "COMMANDS.LoadCommandsFromINI",
                       &fLoadCommandsFromINI, &size);
@@ -567 +568 @@
         }
         //This updates the old commands.dat file to the new format
-        //assigning the IDs based on file order or on next available ID if
-        //COMMAND.DAT is hand edited.
+        //assigning the IDs based on file order or on next available ID 
         else {
           for (x = 0; x < 300; x++) {
@@ -839 +839 @@
    else
      temp->HotKeyID = 0;
-   DbgMsg(pszSrcFile, __LINE__, "info %i", temp->HotKeyID);
+   //DbgMsg(pszSrcFile, __LINE__, "info %i", temp->HotKeyID);
    return TRUE;
 }

trunk/dll/dircnrs.c

@@ -3544 +3544 @@
 
   if (dcd && dcd->oldproc) {
-      // 11 May 08 SHL fixme debug fortify
-      if ((ULONG)dcd->oldproc == 0xa9a9a9a9)
-        DbgMsg(pszSrcFile, __LINE__, "calling oldproc after dcd free msg %x mp1 %x mp2 %x", msg, mp1, mp2);
-      return dcd->oldproc(hwnd, msg, mp1, mp2);
+#   ifdef FORTIFY    // 11 May 08 SHL fixme debug fortify
+    if ((ULONG)dcd->oldproc == 0xa9a9a9a9)
+      DbgMsg(pszSrcFile, __LINE__, "calling oldproc after dcd free msg %x mp1 %x mp2 %x",
+             msg, mp1, mp2);
+#   endif
+    return dcd->oldproc(hwnd, msg, mp1, mp2);
   }
   else

trunk/dll/draglist.c

@@ -374 +374 @@
       ok = ok && pDItem->hstrTargetName;
       if (!ok) {
-        DbgMsg(pszSrcFile, __LINE__, "DrgAddStrHandle failed at %lu for %s", ulNumfiles, szFile);
+        //DbgMsg(pszSrcFile, __LINE__, "DrgAddStrHandle failed at %lu for %s", ulNumfiles, szFile);
         // If we have string handle add overflow, release corrupt DragItem
         // We release 3 more to work around 1st time drag failure reported by Gregg
@@ -489 +489 @@
         ok = ok && pDItem->hstrTargetName;
         if (!ok) {
-          DbgMsg(pszSrcFile, __LINE__, "DrgAddStrHandle failed at %lu for %s", ulNumfiles, szFile);
+          //DbgMsg(pszSrcFile, __LINE__, "DrgAddStrHandle failed at %lu for %s", ulNumfiles, szFile);
           // If we have string handle add overflow, release corrupt DragItem
           // We release 3 more to work around 1st time drag failure reported by Gregg

trunk/dll/notify.c

@@ -440 +440 @@
   case WM_CLOSE:
     if (pszCachedNote)
-      DbgMsg(pszSrcFile, __LINE__, "pszCachedNote %p unexpected", pszCachedNote);       // 18 Jul 08 SHL fixme to be Runtime_Error
+      Runtime_Error(pszSrcFile, __LINE__, "pszCachedNote %p unexpected", pszCachedNote);
     else {
       // Cache last item for next open

trunk/dll/systemf.h

@@ -11 +11 @@
   Change log
   21 Dec 09 GKY Added CheckExecutibleFlags to streamline code in command.c assoc.c & cmdline.c
-  17 JAN 10 GKY Changes to environment handling in ExecuteOnList to facilitate move of commands to INI and allow
-                the same commandline to have different environments (multiple different command titles).
-  17 JAN 10 GKY Add ENVIRONMENT_SIZE vaiable to replace multiple (often different hard coded sizes) set to 2048
-                (the largest value I found).
+  17 JAN 10 GKY Changes to environment handling in ExecuteOnList to facilitate move of commands
+                to INI and allow the same commandline to have different environments
+                (multiple different command titles).
+  17 JAN 10 GKY Add ENVIRONMENT_SIZE vaiable to replace multiple (often different hard coded
+                sizes) set to 2048 (the largest value I found).
 
 ***********************************************************************/

trunk/dll/tmrsvcs.c

@@ -69 +69 @@
     err_msec = (cur_msec - pitd->start_msec) - pitd->interval_msec;
     // Estimate counts per msec
-#if 0 // 05 Jan 08 SHL fixme to be gone when no longer needed for testing
-    DbgMsg(pszSrcFile, __LINE__,
-           "err_msec %d elapsed_msec %d estimated %u misses %u",
-           err_msec, elapsed_msec, pitd->estimated, pitd->misses);
-#endif
     if (err_msec > 0) {
       // Late - need to reduce estimated count