Changeset 151 for trunk/src/helpers/apps.c

Timestamp:

Mar 26, 2002, 8:02:50 PM (23 years ago)

Author:

umoeller

Message:

Misc fixes

File:

• trunk/src/helpers/apps.c (modified) (4 diffs)

trunk/src/helpers/apps.c

@@ -993 +993 @@
             }
 
-            _Pmpf((__FUNCTION__ ": progt.progc: %d", pNewProgDetails->progt.progc));
-            _Pmpf(("    progt.fbVisible: 0x%lX", pNewProgDetails->progt.fbVisible));
-            _Pmpf(("    progt.pszTitle: \"%s\"", (pNewProgDetails->pszTitle) ? pNewProgDetails->pszTitle : "NULL"));
-            _Pmpf(("    exec: \"%s\"", (pNewProgDetails->pszExecutable) ? pNewProgDetails->pszExecutable : "NULL"));
-            _Pmpf(("    params: \"%s\"", (pNewProgDetails->pszParameters) ? pNewProgDetails->pszParameters : "NULL"));
-            _Pmpf(("    startup: \"%s\"", (pNewProgDetails->pszStartupDir) ? pNewProgDetails->pszStartupDir : "NULL"));
-            _Pmpf(("    pszIcon: \"%s\"", (pNewProgDetails->pszIcon) ? pNewProgDetails->pszIcon : "NULL"));
-            _Pmpf(("    environment: "));
-            {
-                PSZ pszThis = pNewProgDetails->pszEnvironment;
-                while (pszThis && *pszThis)
+            #ifdef DEBUG_PROGRAMSTART
+                _Pmpf((__FUNCTION__ ": progt.progc: %d", pNewProgDetails->progt.progc));
+                _Pmpf(("    progt.fbVisible: 0x%lX", pNewProgDetails->progt.fbVisible));
+                _Pmpf(("    progt.pszTitle: \"%s\"", (pNewProgDetails->pszTitle) ? pNewProgDetails->pszTitle : "NULL"));
+                _Pmpf(("    exec: \"%s\"", (pNewProgDetails->pszExecutable) ? pNewProgDetails->pszExecutable : "NULL"));
+                _Pmpf(("    params: \"%s\"", (pNewProgDetails->pszParameters) ? pNewProgDetails->pszParameters : "NULL"));
+                _Pmpf(("    startup: \"%s\"", (pNewProgDetails->pszStartupDir) ? pNewProgDetails->pszStartupDir : "NULL"));
+                _Pmpf(("    pszIcon: \"%s\"", (pNewProgDetails->pszIcon) ? pNewProgDetails->pszIcon : "NULL"));
+                _Pmpf(("    environment: "));
                 {
-                    _Pmpf(("      \"%s\"", pszThis));
-                    pszThis += strlen(pszThis) + 1;
+                    PSZ pszThis = pNewProgDetails->pszEnvironment;
+                    while (pszThis && *pszThis)
+                    {
+                        _Pmpf(("      \"%s\"", pszThis));
+                        pszThis += strlen(pszThis) + 1;
+                    }
                 }
-            }
-
-            _Pmpf(("    swpInitial.fl = 0x%lX, x = %d, y = %d, cx = %d, cy = %d:",
-                        pNewProgDetails->swpInitial.fl,
-                        pNewProgDetails->swpInitial.x,
-                        pNewProgDetails->swpInitial.y,
-                        pNewProgDetails->swpInitial.cx,
-                        pNewProgDetails->swpInitial.cy));
-            _Pmpf(("    behind = %d, hwnd = %d, res1 = %d, res2 = %d",
-                        pNewProgDetails->swpInitial.hwndInsertBehind,
-                        pNewProgDetails->swpInitial.hwnd,
-                        pNewProgDetails->swpInitial.ulReserved1,
-                        pNewProgDetails->swpInitial.ulReserved2));
+
+                _Pmpf(("    swpInitial.fl = 0x%lX, x = %d, y = %d, cx = %d, cy = %d:",
+                            pNewProgDetails->swpInitial.fl,
+                            pNewProgDetails->swpInitial.x,
+                            pNewProgDetails->swpInitial.y,
+                            pNewProgDetails->swpInitial.cx,
+                            pNewProgDetails->swpInitial.cy));
+                _Pmpf(("    behind = %d, hwnd = %d, res1 = %d, res2 = %d",
+                            pNewProgDetails->swpInitial.hwndInsertBehind,
+                            pNewProgDetails->swpInitial.hwnd,
+                            pNewProgDetails->swpInitial.ulReserved1,
+                            pNewProgDetails->swpInitial.ulReserved2));
+            #endif
 
             if (!(*phapp = WinStartApp(hwndNotify,
@@ -1037 +1039 @@
             {
                 // cannot start app:
-                // _Pmpf((__FUNCTION__ ": WinStartApp failed"));
+                #ifdef DEBUG_PROGRAMSTART
+                    _Pmpf((__FUNCTION__ ": WinStartApp failed"));
+                #endif
+
                 arc = ERROR_FILE_NOT_FOUND;
                 // unfortunately WinStartApp doesn't
@@ -1289 +1294 @@
             xstrInit(&strParamsPatched, 100);
 
-        // _Pmpf((__FUNCTION__ ": old progc: 0x%lX", pcProgDetails->progt.progc));
-        // _Pmpf(("  pszTitle: %s", (ProgDetails.pszTitle) ? ProgDetails.pszTitle : NULL));
-        // _Pmpf(("  pszIcon: %s", (ProgDetails.pszIcon) ? ProgDetails.pszIcon : NULL));
+        #ifdef DEBUG_PROGRAMSTART
+            _Pmpf((__FUNCTION__ ": old progc: 0x%lX", pcProgDetails->progt.progc));
+            _Pmpf(("  pszTitle: %s", (ProgDetails.pszTitle) ? ProgDetails.pszTitle : NULL));
+            _Pmpf(("  pszIcon: %s", (ProgDetails.pszIcon) ? ProgDetails.pszIcon : NULL));
+        #endif
 
         // program type fixups
@@ -1523 +1530 @@
     } // end if (ProgDetails.pszExecutable)
 
-    // _Pmpf((__FUNCTION__ ": returning %d", arc));
+    #ifdef DEBUG_PROGRAMSTART
+        _Pmpf((__FUNCTION__ ": returning %d", arc));
+    #endif
 
     return (arc);