Changeset 35

Timestamp:

May 2, 2013, 2:58:52 PM (12 years ago)

Author:

Alex Taylor

Message:

Fixed broken SplPdQuery entrypoint. BLDLEVEL description now properly set.

Location:

trunk/cups_pdr

Files:

• cups.c (modified) (2 diffs)
• cups.def (modified) (1 diff)
• cups.h (modified) (1 diff)
• cups.ico (modified) ( previous)
• makefile (modified) (2 diffs)
• readme.os2 (modified) (1 diff)

trunk/cups_pdr/cups.c

@@ -896 +896 @@
 
         case BIDI_Q_PORTDRV:
+            // If no buffer was provided, just return the required size
+            if ( !pOutData && pcbOutData ) {
+                *pcbOutData = sizeof( PORTSETTINGS );
+                return ERROR_MORE_DATA;
+            }
             // Make sure the data is valid
-            if ( !pOutData || *pcbOutData < sizeof( PORTSETTINGS ))
+            if ( !pOutData || !pcbOutData || ( *pcbOutData < sizeof( PORTSETTINGS )))
                 return( ERROR_INVALID_PARAMETER );
             pSettings = (PPORTSETTINGS) pOutData;
@@ -913 +918 @@
                     if ( token[ strlen(token) - 1 ] == ';')
                         token[ strlen(token) - 1 ] = '\0';
-                    strncpy( pSettings->szHost, token, STR_LEN_QUEUENAME );
+                    strncpy( pSettings->szQueue, token, STR_LEN_QUEUENAME );
                 }
             }

trunk/cups_pdr/cups.def

@@ -1 +1 @@
 LIBRARY CUPS INITINSTANCE TERMINSTANCE
-DESCRIPTION '@#netlabs.org:1.03#@##1## 16 Feb 2011 20:53:08     sigel::::::@@@#netlabs.org:1.03#@##1## 16 Feb 2011 20:08:22     sigel::::::@@@#netlabs.org:1.'
+DESCRIPTION '@#netlabs.org:1.04#@##1## 1 May 2013 21:45:10      REINFORCE::::::@@CUPS port driver'
 PROTMODE
 DATA MULTIPLE NONSHARED LOADONCALL

trunk/cups_pdr/cups.h

@@ -1 @@
-#define DRIVER_VERSION                "1.03"
+#define DRIVER_VERSION                "1.04"
 #define PATH_CUPS_PDR                 "?:\\OS2\\DLL\\CUPS.PDR"
 #define CUPS_DLL                      "CUPS.PDR"

trunk/cups_pdr/makefile

@@ -4 +4 @@
 BASE=CUPS
 DEF_PORTNAME=CUPS
+DESCR="CUPS port driver"
 
 ICCOPTS=-Gd-e- -Sp1 -Ss+ -Ms -C+ -Fo$@ -Dcdecl= -D_cdecl= -Rn -O -Wpro -Q+ -Yp+ -Ss+
@@ -20 +21 @@
                                 $(BASE).RES \
                                 $(BASE).DEF
-        @makedesc -Rcups.def -N"netlabs.org" -V"^#define=DRIVER_VERSION,cups.h" cups.def
+        @makedesc -D$(DESCR) -N"netlabs.org" -V"^#define=DRIVER_VERSION,cups.h" cups.def
         ILINK $(LINKOPTS) @<<
 $(BASE)

trunk/cups_pdr/readme.os2

@@ -10 +10 @@
 
 History:
+2013-05-01      - fixed partially broken SplPdQuery
+                - fixed bldlevel description
 2011-02-16      - implemented SplPdSet and SplPdQuery APIs
                 - cupslpr.exe is now loaded from the path where TCP/IP is installed (even if not on the boot drive)