Changeset 772 for branches/smbpdr-1.0

Timestamp:

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

Author:

Alex Taylor

Message:

Fix to SplPdQuery allowing the required buffer size to be queried.

Location:

branches/smbpdr-1.0

Files:

• changelog (modified) (1 diff)
• smb.c (modified) (1 diff)
• smb.def (modified) (1 diff)
• smb.h (modified) (1 diff)

branches/smbpdr-1.0/changelog

@@ +1 @@
+Version 1.0.3 02-05-2013
+  !Fixed: SplPdQuery now properly returns the required buffer size if a NULL
+          buffer is specified.
+
 Version 1.0.2 12-05-2012
   +Added: SplPdQuery and SplPdSet now implemented.  This allows applications to

branches/smbpdr-1.0/smb.c

@@ -955 +955 @@
 
         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;

branches/smbpdr-1.0/smb.def

@@ -1 +1 @@
 LIBRARY SMB INITINSTANCE TERMINSTANCE
-DESCRIPTION '@#netlabs.org:1.02#@##1## 5 Dec 2012 15:31:07      sigel::::::@@Samba client port driver for SMB printing'
+DESCRIPTION '@#netlabs.org:1.03#@##1## 2 May 2013 09:48:38      REINFORCE::::::@@Samba client port driver for SMB printing'
 PROTMODE
 DATA MULTIPLE NONSHARED LOADONCALL

branches/smbpdr-1.0/smb.h

@@ -1 @@
-#define DRIVER_VERSION               "1.02"
+#define DRIVER_VERSION               "1.03"
 #define PATH_SMB_PDR                 "?:\\OS2\\DLL\\SMB.PDR"
 #define SMB_DLL                      "SMB.PDR"