Changeset 31 for branches/1.0

Timestamp:

May 8, 2010, 6:13:50 PM (15 years ago)

Author:

herwigb

Message:

Streamline code

Location:

branches/1.0/src

Files:

• build.cmd (modified) (1 diff)
• de/readme.txt (modified) (3 diffs)
• de/uni.dlg (modified) (1 diff)
• splpd.c (modified) (5 diffs)

branches/1.0/src/build.cmd

@@ -20 +20 @@
 echo Done.
 echo Attaching EAS.
-ea2 -e DEFAULT_PORT=UNI uni.pdr >>build.log
+call ea2 -e DEFAULT_PORT=UNI uni.pdr >>build.log
 echo Done.
 d:

branches/1.0/src/de/readme.txt

@@ -16 +16 @@
 
 The eCS (OS/2) Universal Port Driver (UNI.PDR) redirects the datastream 
-from a printer port to a program. It has been tested to work with ePDF 
+from a printer port to a program. It has been tested to work with 
+
+  - ePDF.exe
+  - smbspool.exe
+  
 successfully, but should work with any program being capable to accept a 
 file as an argument on the commandline.
@@ -22 +26 @@
 uni.pdr is (like smb.pdr and cups.pdr) based upon Serge Starcks lpr32.pdr.
 Unlike the above 2 pdrs, which have the program to service hardcoded into
-the driver, both program and parameters may be configured individually in
-uni.pdr.
+the driver, uni.pdr allows program, parameters and working directory to be 
+configured individually.
 
 When configuring the parameter field, make sure to have the %file% token
@@ -47 +51 @@
    - changelog created
    - got it working
+   
+ v1.0 alpha2:
+   - find button added
+   - working directory added
+   
+ v1.0 alpha3:
+   - parameters are split into separate parameters internally
+     (as required by smbspool.exe and most likely other programs, too)
+   - fixed token replacement logic (diver)

branches/1.0/src/de/uni.dlg

@@ -19 +19 @@
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
-        LTEXT           "Path amd file:", DT_PROGRAM, 13, 118, 53, 8, DT_VCENTER
+        LTEXT           "Path and file:", DT_PROGRAM, 13, 118, 53, 8, DT_VCENTER
         ENTRYFIELD      "", ID_PROGRAM, 15, 106, 200, 8, ES_MARGIN
         LTEXT           "Parameters:", DT_PARAMETERS, 13, 71, 204, 8, 

branches/1.0/src/splpd.c

@@ -507 +507 @@
         char        spool_dir[256];
         ULONG       ulBootDrive;
-        char        *p1 = NULL;
-        char        *p2 = NULL;
-        char        *p3 = NULL;
-        char        *p4 = NULL;
-        char        *p5 = NULL;
-        char        *p6 = NULL;
-        char        *p7 = NULL;
-        char        *p8 = NULL;
-        char        *p9 = NULL;
+        char        *p_arg[10];
 
         rc = PrfQueryProfileString (HINI_SYSTEMPROFILE,
@@ -587 +579 @@
 
 //  split into single paramters 
-        p1 = strtok (j_parms, " ");
-        p2 = strtok (NULL, " ");
-        p3 = strtok (NULL, " ");
-        p4 = strtok (NULL, " ");
-        p5 = strtok (NULL, " ");
-        p6 = strtok (NULL, " ");
-        p7 = strtok (NULL, " ");
-        p8 = strtok (NULL, " ");
-        p9 = strtok (NULL, " ");
+        p_arg[0] = binfile;
+        for (i=1; i < 10; i++) {
+                if ( i == 1) {
+                        p_arg[i] = strtok(j_parms, " ");
+                } else {
+                        p_arg[i] = strtok(NULL, " ");
+                }
+        };
+        p_arg[10] = NULL;
 
         if (strlen(workingdir) > 0)
@@ -602 +594 @@
         };
 
-        rc = spawnlp(P_WAIT,binfile,binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
+        rc = spawnvp(P_WAIT,p_arg[0],p_arg);
 
         while (rc != 0)
         {
-                sprintf(errorstr,"Error during spooling to %s %s %s %s %s %s %s %s %s %s ",binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
+                sprintf(errorstr,"Error during spooling to %s %s ",binfile,j_parms,NULL);
 
                 resp = WinMessageBox (HWND_DESKTOP,
@@ -615 +607 @@
                 if (resp != MBID_CANCEL )
                 {
-                        rc = spawnlp(P_WAIT,binfile,binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
+                        rc = spawnvp(P_WAIT,p_arg[0],p_arg);
                 }
                 else rc = 0;
@@ -639 +631 @@
         return rc;
 }
-