Changeset 1497

Timestamp:

Jan 8, 2010, 5:39:40 AM (16 years ago)

Author:

Gregg Young

Message:

Update ExecOnList to pass environment

Location:

trunk/dll

Files:

• arccnrs.c (modified) (4 diffs)
• archive.c (modified) (1 diff)
• assoc.c (modified) (1 diff)
• collect.c (modified) (1 diff)
• command.c (modified) (3 diffs)
• comp.c (modified) (1 diff)
• defview.c (modified) (4 diffs)
• dircnrs.c (modified) (2 diffs)
• mainwnd.c (modified) (2 diffs)
• misc.c (modified) (4 diffs)
• newview.c (modified) (1 diff)
• systemf.c (modified) (3 diffs)
• systemf.h (modified) (1 diff)
• worker.c (modified) (6 diffs)

trunk/dll/arccnrs.c

@@ -300 +300 @@
         if (TestBinary(ad->arcname)) {
           if (*binview)
-            ExecOnList((HWND) 0, binview, WINDOWED | SEPARATE, NULL, list,
+            ExecOnList((HWND) 0, binview, WINDOWED | SEPARATE, NULL, NULL, list,
                        NULL, pszSrcFile, __LINE__);
           else
@@ -308 +308 @@
           if (*viewer) {
             ExecOnList((HWND) 0, viewer, WINDOWED | SEPARATE |
-                            (fViewChild ? CHILD : 0),
+                            (fViewChild ? CHILD : 0), NULL,
                              NULL, list, NULL, pszSrcFile, __LINE__);
           }
@@ -1961 +1961 @@
               ExecOnList(hwnd,
                          li->runfile,
-                         WINDOWED | SEPARATEKEEP | PROMPT,
-                         li->targetpath,
-                         NULL, GetPString(IDS_EXECARCFILETITLETEXT),
+                         WINDOWED | SEPARATEKEEP | PROMPT,
+                         li->targetpath, NULL, NULL, GetPString(IDS_EXECARCFILETITLETEXT),
                          pszSrcFile, __LINE__);
             else if (li->type == IDM_VIRUSSCAN)
               ExecOnList(hwnd, virus, PROMPT | WINDOWED | SEPARATEKEEP,
-                         li->targetpath, NULL,
+                         li->targetpath, NULL, NULL,
                          GetPString(IDS_VIRUSSCANARCHIVETITLETEXT),
                          pszSrcFile, __LINE__);
@@ -2077 +2076 @@
                                   (li->type == IDM_EDITTEXT) ? editor :
                                   bined),
-                           WINDOWED | SEPARATE, li->targetpath, li->list,
+                           WINDOWED | SEPARATE, NULL, NULL, // li->targetpath,
+                           li->list,
                            NULL, pszSrcFile, __LINE__);
               }

trunk/dll/archive.c

@@ -271 +271 @@
             *p = 0;
           ExecOnList(hwnd, s, WINDOWED | SEPARATEKEEP | MAXIMIZED | PROMPT,
-                     NULL, NULL, GetPString(IDS_ARCEXECHELPTEXT),
+                     NULL, NULL, NULL, GetPString(IDS_ARCEXECHELPTEXT),
                      pszSrcFile, __LINE__);
         }

trunk/dll/assoc.c

@@ -503 +503 @@
         rc = ExecOnList(hwnd,
                         info->pszCmdLine,
-                        flags,
+                        flags, NULL,
                         NULL, list, GetPString(IDS_EXECASSOCTITLETEXT),
                         pszSrcFile, __LINE__);

trunk/dll/collect.c

@@ -2566 +2566 @@
                 strcat(li->targetpath, " %a");
                 ExecOnList(dcd->hwndParent, li->targetpath,
-                           PROMPT | WINDOWED, NULL, li->list, NULL,
+                           PROMPT | WINDOWED, NULL, NULL, li->list, NULL,
                            pszSrcFile, __LINE__);
                 FreeList(li->list);

trunk/dll/command.c

@@ -1290 +1290 @@
       ExecOnList(hwnd,
                  info->pszCmdLine,
-                 flags, info->env != NullStr ? info->env : NULL,
+                 flags, NULL, info->env != NullStr ? info->env : NULL,
                  fakelist, GetPString(IDS_EXECCMDTITLETEXT),
                  pszSrcFile, __LINE__);
@@ -1305 +1305 @@
         ExecOnList(hwnd,
                    info->pszCmdLine,
-                   flags, info->env != NullStr ? info->env : NULL,
+                   flags, NULL, info->env != NullStr ? info->env : NULL,
                    fakelist, GetPString(IDS_EXECCMDTITLETEXT),
                    pszSrcFile, __LINE__);
@@ -1313 +1313 @@
       ExecOnList(hwnd,
                  info->pszCmdLine,
-                 flags, info->env != NullStr ? info->env : NULL,
+                 flags, NULL, info->env != NullStr ? info->env : NULL,
                  list, GetPString(IDS_EXECCMDTITLETEXT),
                  pszSrcFile, __LINE__);

trunk/dll/comp.c

@@ -2833 +2833 @@
             fakelist[1] = szPathName;
             fakelist[2] = NULL;
-            ExecOnList(hwnd, compare,
-                       WINDOWED | SEPARATEKEEP, NULL, fakelist, NULL,
+            ExecOnList(hwnd, compare, WINDOWED | SEPARATEKEEP,
+                       NULL, NULL, fakelist, NULL,
                        pszSrcFile, __LINE__);
           }

trunk/dll/defview.c

@@ -242 +242 @@
     case IDM_EDITBINARY:
       if (*bined) {
-        ExecOnList((HWND) 0, bined, WINDOWED | SEPARATE, NULL, dummy, NULL,
+        ExecOnList((HWND) 0, bined, WINDOWED | SEPARATE, NULL, NULL, dummy, NULL,
                    pszSrcFile, __LINE__);
         break;
@@ -249 +249 @@
     case IDM_EDITTEXT:
       if (*editor)
-        ExecOnList((HWND) 0, editor, WINDOWED | SEPARATE, NULL, dummy, NULL,
+        ExecOnList((HWND) 0, editor, WINDOWED | SEPARATE, NULL, NULL, dummy, NULL,
                    pszSrcFile, __LINE__);
       else {
@@ -287 +287 @@
                              binview,
                              WINDOWED | SEPARATE |
-                             ((fViewChild) ? CHILD : 0), NULL, dummy, NULL,
+                             ((fViewChild) ? CHILD : 0), NULL, NULL, dummy, NULL,
                              pszSrcFile, __LINE__);
                 }
@@ -305 +305 @@
                              viewer,
                              WINDOWED | SEPARATE |
-                             ((fViewChild) ? CHILD : 0), NULL, dummy, NULL,
+                             ((fViewChild) ? CHILD : 0), NULL, NULL, dummy, NULL,
                              pszSrcFile, __LINE__);
                 }

trunk/dll/dircnrs.c

@@ -1862 +1862 @@
                   dummy[1] = NULL;
                   ExecOnList(hwnd,
-                             editor, WINDOWED | SEPARATE, NULL, dummy, NULL,
-                             pszSrcFile, __LINE__);
+                             editor, WINDOWED | SEPARATE, NULL, NULL,
+                             dummy, NULL, pszSrcFile, __LINE__);
                 }
                 else
@@ -3093 +3093 @@
               strcat(li->targetpath, " %a");
               ExecOnList(dcd->hwndParent, li->targetpath,
-                         PROMPT | WINDOWED, NULL, li->list, NULL,
+                         PROMPT | WINDOWED, NULL, NULL, li->list, NULL,
                          pszSrcFile, __LINE__);
               FreeList(li->list);

trunk/dll/mainwnd.c

@@ -1771 +1771 @@
                        WINDOWED | ((fKeepCmdLine) ?
                                    SEPARATEKEEP : SEPARATE),
-                       directory, list, NULL, pszSrcFile, __LINE__);
+                       directory, NULL, list, NULL, pszSrcFile, __LINE__);
             xfree(list, pszSrcFile, __LINE__);
             WinDestroyWindow(hwnd);
@@ -2244 +2244 @@
           strcat(li->targetpath, " %a");
           ExecOnList(hwndMain,
-                     li->targetpath, PROMPT | WINDOWED, NULL, li->list, NULL,
+                     li->targetpath, PROMPT | WINDOWED, NULL, NULL, li->list, NULL,
                      pszSrcFile, __LINE__);
           FreeList(li->list);

trunk/dll/misc.c

@@ -1770 +1770 @@
       list[0] = filename;
       list[1] = NULL;
-      ExecOnList(hwnd, binview, WINDOWED | SEPARATE, NULL, list, NULL,
+      ExecOnList(hwnd, binview, WINDOWED | SEPARATE, NULL, NULL, list, NULL,
                  pszSrcFile, __LINE__);
       return;
@@ -1782 +1782 @@
       ExecOnList(hwnd, viewer,
                  WINDOWED | SEPARATE | (fViewChild ? CHILD : 0),
-                 NULL, list, NULL, pszSrcFile, __LINE__);
+                 NULL, NULL, list, NULL, pszSrcFile, __LINE__);
       return;
     }
@@ -1798 +1798 @@
       list[0] = filename;
       list[1] = NULL;
-      ExecOnList(hwnd, bined, WINDOWED | SEPARATE, NULL, list, NULL,
+      ExecOnList(hwnd, bined, WINDOWED | SEPARATE, NULL, NULL, list, NULL,
                  pszSrcFile, __LINE__);
       return;
@@ -1808 +1808 @@
       list[0] = filename;
       list[1] = NULL;
-      ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, list, NULL,
+      ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, NULL, list, NULL,
                  pszSrcFile, __LINE__);
       return;

trunk/dll/newview.c

@@ -3345 +3345 @@
         dummy[0] = ad->filename;
         dummy[1] = NULL;
-        ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, dummy, NULL,
+        ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, NULL, dummy, NULL,
                    pszSrcFile, __LINE__);
       }

trunk/dll/systemf.c

@@ -147 +147 @@
  */
 
-int ExecOnList(HWND hwnd, char *command, int flags, char *tpath,
+int ExecOnList(HWND hwnd, PSZ command, int flags, PSZ tpath,  PSZ environment,
                PSZ *list, PCSZ prompt, PCSZ pszCallingFile, UINT uiLineNumber)
 {
@@ -648 +648 @@
   {
     EXECARGS ex;
-    ULONG size;
+    //ULONG size;
     int ret;
 
     memset(&ex, 0, sizeof(EXECARGS));
-    size = sizeof(ex.environment) - 1;
-    PrfQueryProfileData(fmprof, FM3Str, command, ex.environment, &size);
+    //size = sizeof(ex.environment) - 1;
+    //PrfQueryProfileData(fmprof, FM3Str, command, ex.environment, &size);
     if (flags & PROMPT) {
       /* allow editing command line */
@@ -671 +671 @@
       ex.flags = flags;
     ex.flags &= (~PROMPT);
+    //DbgMsg(pszSrcFile, __LINE__, "Inserted %s", environment);
     ret = runemf2(ex.flags, hwnd, pszCallingFile, uiLineNumber, path,
-                   (*ex.environment) ? ex.environment : NULL,
+                   environment ? environment : NULL,
                    "%s", commandline);
     free(commandline);

trunk/dll/systemf.h

@@ -50 +50 @@
 
 ULONG CheckExecutibleFlags(HWND hwnd, INT caller);
-INT ExecOnList(HWND hwnd, PSZ command, INT flags, PSZ tpath,
+INT ExecOnList(HWND hwnd, PSZ command, INT flags, PSZ tpath, PSZ environment,
                PSZ *list, PCSZ prompt, PCSZ pszCallingFile, UINT uiLineNumber);
 BOOL ShowSession(HWND hwnd, PID pid);

trunk/dll/worker.c

@@ -984 +984 @@
                   ExecOnList(wk->hwndFrame,
                              compare,
-                             WINDOWED | SEPARATEKEEP, NULL, fakelist, NULL,
+                             WINDOWED | SEPARATEKEEP, NULL, NULL, fakelist, NULL,
                              pszSrcFile, __LINE__);
                 }
@@ -1142 +1142 @@
             ExecOnList(wk->hwndFrame,
                        "%a",
-                       WINDOWED | SEPARATE | PROMPT,
+                       WINDOWED | SEPARATE | PROMPT, NULL,
                        NULL, wk->li->list, GetPString(IDS_DOITYOURSELFTEXT),
                        pszSrcFile, __LINE__);
@@ -1403 +1403 @@
               ExecOnList((HWND) 0,
                          binview,
-                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL,
+                         WINDOWED | SEPARATE, NULL, NULL, wk->li->list, NULL,
                          pszSrcFile, __LINE__);
               break;
@@ -1414 +1414 @@
                          WINDOWED | SEPARATE |
                          ((fViewChild) ? CHILD : 0),
-                         NULL, wk->li->list, NULL,
+                         NULL, NULL, wk->li->list, NULL,
                          pszSrcFile, __LINE__);
             else {
@@ -1449 +1449 @@
               ExecOnList((HWND) 0,
                          bined,
-                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL,
+                         WINDOWED | SEPARATE, NULL, NULL, wk->li->list, NULL,
                          pszSrcFile, __LINE__);
               break;
@@ -1459 +1459 @@
               ExecOnList((HWND) 0,
                          editor,
-                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL,
+                         WINDOWED | SEPARATE, NULL,  NULL, wk->li->list, NULL,
                          pszSrcFile, __LINE__);
             else {