Changeset 758

Timestamp:

Jan 24, 2013, 2:25:43 AM (13 years ago)

Author:

Alex Taylor

Message:

Auto-port numbers now generated in base 10 instead of base 4.
Implemented SplPdQuery/SplPdSet entrypoints, which are required for programs to create/configure ports.
Added sample program which demonstrates this (smbport.c). Added BLDLEVEL signature (uses MAKEDESC.CMD).

Location:

branches/smbpdr-1.0

Files:

• build.cmd (modified) (1 diff)
• changelog (modified) (1 diff)
• makedesc.cmd (added)
• makefile (modified) (1 diff)
• smb.c (modified) (4 diffs)
• smb.def (modified) (1 diff)
• smb.h (modified) (2 diffs)
• smbport.c (added)

branches/smbpdr-1.0/build.cmd

@@ -5 +5 @@
 del smb.o
 del smb.pdr
+cmd /c makedesc -D"Samba client port driver for SMB printing" -N"netlabs.org" -V"#define=DRIVER_VERSION,smb.h" smb.def
 gcc -o smb.o smb.c -c
 RC -r smb.RC smb.RES

branches/smbpdr-1.0/changelog

@@ +1 @@
+Version 1.0.2 12-05-2012
+  +Added: SplPdQuery and SplPdSet now implemented.  This allows applications to
+          update SMB port settings through the SplPdSet entrypoint.
+  +Added: Driver now has bldlevel string.
+  !Fixed: Port names are now numbered normally instead of in base 4.
+
+
 Version 1.0.1 05-03-2010
   +Added: Show return code from smbspool in error message (useful only together

branches/smbpdr-1.0/makefile

@@ -16 +16 @@
 $(BASE).DLL:                    $(BASE).OBJ \
                                 $(BASE).RES
+        makedesc -D"Samba client port driver for SMB printing" -N"netlabs.org" -V"^#define=DRIVER_VERSION,smb.h" smb.def
         ILINK $(LINKOPTS) @<<
 $(BASE)

branches/smbpdr-1.0/smb.c

@@ -59 +59 @@
 #include    <process.h>
 #include    "SMB.h"
+
+#define BIDI_SET_PORTDRV    0x00000019
+#define BIDI_Q_PORTDRV      0x00008019
+
 
 /* Password encryption/decryption routines from ndpsmb.c */
@@ -493 +497 @@
         while ( (i < MAX_PORTS) && fPortExists )
         {
-                _itoa( i, pszEndPortName, 4);
+                _itoa( i, pszEndPortName, 10);
                 fPortExists = PrfQueryProfileString (HINI_SYSTEMPROFILE,
                                                                                         APPNAME_PM_SPOOLER_PORT,
@@ -931 +935 @@
 
 }
+#if 1
+ULONG  APIENTRY SplPdQuery ( PSZ    pszPortName,
+                             ULONG  ulFlags,
+                             ULONG  ulCommand,
+                             PVOID  pInData,
+                             ULONG  cbInData,
+                             PVOID  pOutData,
+                             PULONG pcbOutData )
+{
+    PPORTSETTINGS pSettings;
+    CHAR          szAppName[ STR_LEN_PORTNAME ];
+    ULONG         rc;
+
+    // Generate appname for "PM_SMBx"
+    strcpy( szAppName, APPNAME_LEAD_STR);
+    strncat( szAppName, pszPortName, STR_LEN_PORTNAME-1 );
+
+    switch ( ulCommand ) {
+
+        case BIDI_Q_PORTDRV:
+            // Make sure the data is valid
+            if ( !pOutData || *pcbOutData < sizeof( PORTSETTINGS ))
+                return( ERROR_INVALID_PARAMETER );
+            pSettings = (PPORTSETTINGS) pOutData;
+
+            PrfQueryProfileString( HINI_SYSTEMPROFILE, szAppName,
+                                   KEY_INITIALIZATION, NULL,
+                                   pSettings->szPortData, STR_LEN_PORTDESC );
+            *pcbOutData = sizeof( PORTSETTINGS );
+            rc = NO_ERROR;
+            break;
+
+        default:
+            rc = ERROR_NOT_SUPPORTED;
+            //rc = NO_ERROR;
+            break;
+    }
+
+   return ( rc );
+}
+ULONG  APIENTRY SplPdSet   ( PSZ    pszPortName,
+                             ULONG  ulFlags,
+                             ULONG  ulCommand,
+                             PVOID  pInData,
+                             ULONG  cbInData )
+{
+    PPORTSETTINGS pSettings;
+    CHAR          szIniStr[ STR_LEN_PORTDESC ] = {0};
+    CHAR          szAppName[ STR_LEN_PORTNAME ];
+    PSZ           token;
+    ULONG         rc;
+
+    // Generate appname for "PM_CUPSx"
+    strcpy( szAppName, APPNAME_LEAD_STR);
+    strncat( szAppName, pszPortName, STR_LEN_PORTNAME-1 );
+
+    switch ( ulCommand ) {
+
+        case BIDI_SET_PORTDRV:
+            // Validate the data
+            if ( !pInData || cbInData < sizeof( PORTSETTINGS ))
+                return( ERROR_INVALID_PARAMETER );
+            pSettings = (PPORTSETTINGS) pInData;
+            // Update the INITIALIZATION string
+            PrfWriteProfileString( HINI_SYSTEMPROFILE, szAppName,
+                                   KEY_INITIALIZATION, pSettings->szPortData );
+            PrfWriteProfileString( HINI_SYSTEMPROFILE, APPNAME_PM_SPOOLER_PORT,
+                                   pszPortName, pSettings->szPortData );
+            // Update the DESCRIPTION string
+            if (( token = lprtok( pSettings->szPortData, "#")) != NULL ) {
+                strncpy( szIniStr, token, STR_LEN_PORTDESC-1 );
+                if (( token = lprtok( NULL, "#")) != NULL ) {
+                    if ( token[ strlen(token) - 1 ] == ';')
+                        token[ strlen(token) - 1 ] = '\0';
+                    strncat( szIniStr, ":", STR_LEN_PORTDESC-1 );
+                    strncat( szIniStr, token, STR_LEN_PORTDESC-1 );
+                }
+            }
+            PrfWriteProfileString( HINI_SYSTEMPROFILE,
+                                   szAppName, KEY_DESCRIPTION, szIniStr );
+            rc = NO_ERROR;
+            break;
+
+        default:
+            //rc = ERROR_NOT_SUPPORTED;
+            rc = NO_ERROR;
+            break;
+    }
+    return ( rc );
+
+}
+#else
 ULONG  APIENTRY SplPdQuery ( PSZ    pszDeviceName,
                                                         ULONG  ulFlags,
@@ -951 +1047 @@
         return NO_ERROR;
 }
+#endif
 ULONG  APIENTRY SplPdNewPage ( HFILE  hFile, ULONG ulPageNumber )
 {

branches/smbpdr-1.0/smb.def

@@ -1 +1 @@
 LIBRARY SMB INITINSTANCE TERMINSTANCE
-DESCRIPTION 'SMB Port Driver'
+DESCRIPTION '@#netlabs.org:1.02#@##1## 5 Dec 2012 15:31:07      sigel::::::@@Samba client port driver for SMB printing'
 PROTMODE
 DATA MULTIPLE NONSHARED LOADONCALL
 CODE LOADONCALL
 EXPORTS
-   SPLPDENUMPORT      = SplPdEnumPort         @501
-   SPLPDINSTALLPORT   = SplPdInstallPort      @502
-   SPLPDGETPORTICON   = SplPdGetPortIcon      @503
-   SPLPDQUERYPORT     = SplPdQueryPort        @504
-   SPLPDSETPORT       = SplPdSetPort          @505
-   SPLPDREMOVEPORT    = SplPdRemovePort       @506
-   SPLPDOPEN          = SplPdOpen             @508
-   SPLPDWRITE         = SplPdWrite            @509
-   SPLPDABORTDOC      = SplPdAbortDoc         @510
-   SPLPDNEWPAGE       = SplPdNewPage          @511
-   SPLPDCLOSE         = SplPdClose            @512
-   SPLPDQUERY         = SplPdQuery            @513
-   SPLPDSET           = SplPdSet              @514
+SPLPDENUMPORT      = SplPdEnumPort         @501
+SPLPDINSTALLPORT   = SplPdInstallPort      @502
+SPLPDGETPORTICON   = SplPdGetPortIcon      @503
+SPLPDQUERYPORT     = SplPdQueryPort        @504
+SPLPDSETPORT       = SplPdSetPort          @505
+SPLPDREMOVEPORT    = SplPdRemovePort       @506
+SPLPDOPEN          = SplPdOpen             @508
+SPLPDWRITE         = SplPdWrite            @509
+SPLPDABORTDOC      = SplPdAbortDoc         @510
+SPLPDNEWPAGE       = SplPdNewPage          @511
+SPLPDCLOSE         = SplPdClose            @512
+SPLPDQUERY         = SplPdQuery            @513
+SPLPDSET           = SplPdSet              @514
 

branches/smbpdr-1.0/smb.h

@@ +1 @@
+#define DRIVER_VERSION               "1.02"
 #define PATH_SMB_PDR                 "?:\\OS2\\DLL\\SMB.PDR"
 #define SMB_DLL                      "SMB.PDR"
@@ -184 +185 @@
    ULONG    lfModified;
 } LPRDATA, *PLPRDATA;
+
+/* Port-specific data format used by PrtSet/SplPdSet */
+typedef struct _PORTSETTINGS {
+    CHAR  szPortData[ STR_LEN_PORTDESC ];
+} PORTSETTINGS, *PPORTSETTINGS;
+
 #define ID_IP                       201
 #define ID_SMBQUEUE                 202