Implemented DELETEFORM tested using Gerald's Win32 test code :-).

Jeremy.
(This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4fc65f8edad57b7c226308ac13404847db9d23ec..38393e3de8c3c57038daac1e4614dc5fcc9038ba 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1682,6 +1682,7 @@ BOOL nt_printing_init(void);
 int get_ntforms(nt_forms_struct **list);
 int write_ntforms(nt_forms_struct **list, int number);
 BOOL add_a_form(nt_forms_struct **list, const FORM *form, int *count);
+BOOL delete_a_form(nt_forms_struct **list, UNISTR2 *del_name, int *count, uint32 *ret);
 void update_a_form(nt_forms_struct **list, const FORM *form, int count);
 int get_ntdrivers(fstring **list, char *architecture, uint32 version);
 BOOL get_short_archi(char *short_archi, char *long_archi);
@@ -2886,6 +2887,8 @@ void free_spoolss_q_setprinterdata(SPOOL_Q_SETPRINTERDATA *q_u);
 BOOL spoolss_io_r_setprinterdata(char *desc, SPOOL_R_SETPRINTERDATA *r_u, prs_struct *ps, int depth);
 BOOL convert_specific_param(NT_PRINTER_PARAM **param, const UNISTR2 *value,
                                uint32 type, const uint8 *data, uint32 len);
+BOOL spoolss_io_q_deleteform(char *desc, SPOOL_Q_DELETEFORM *q_u, prs_struct *ps, int depth);
+BOOL spoolss_io_r_deleteform(char *desc, SPOOL_R_DELETEFORM *r_u, prs_struct *ps, int depth);
 BOOL spoolss_io_q_addform(char *desc, SPOOL_Q_ADDFORM *q_u, prs_struct *ps, int depth);
 BOOL spoolss_io_r_addform(char *desc, SPOOL_R_ADDFORM *r_u, prs_struct *ps, int depth);
 BOOL spoolss_io_q_setform(char *desc, SPOOL_Q_SETFORM *q_u, prs_struct *ps, int depth);
@@ -3180,6 +3183,7 @@ uint32 _spoolss_setprinterdata( POLICY_HND *handle,
 uint32 _spoolss_addform( POLICY_HND *handle,
                                uint32 level,
                                const FORM *form);
+uint32 _spoolss_deleteform( POLICY_HND *handle, UNISTR2 *form_name);
 uint32 _spoolss_setform( POLICY_HND *handle,
                                const UNISTR2 *uni_name,
                                uint32 level,

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 7b3ee354ede22d44e81db06f2e16d4a706b62faa..a77ce55063c6a598635f85f9a56761bcc0b995e0 100755 (executable)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -35,7 +35,6 @@
 #define SPOOLSS_GETPRINTPROCESSORDIRECTORY             0x10
 #define SPOOLSS_READPRINTER                            0x16
 #define SPOOLSS_WAITFORPRINTERCHANGE                   0x1c
-#define SPOOLSS_DELETEFORM                             0x1f
 #define SPOOLSS_GETFORM                                        0x20
 #define SPOOLSS_ADDPORT                                        0x25
 #define SPOOLSS_CONFIGUREPORT                          0x26
@@ -91,6 +90,7 @@
 #define SPOOLSS_SETPRINTERDATA                         0x1b
 #define SPOOLSS_CLOSEPRINTER                           0x1d
 #define SPOOLSS_ADDFORM                                        0x1e
+#define SPOOLSS_DELETEFORM                             0x1f
 #define SPOOLSS_SETFORM                                        0x21
 #define SPOOLSS_ENUMFORMS                              0x22
 #define SPOOLSS_ENUMPORTS                              0x23
@@ -1686,6 +1686,19 @@ typedef struct spool_r_setform
 }
 SPOOL_R_SETFORM;
 
+typedef struct spool_q_deleteform
+{
+       POLICY_HND handle;
+       UNISTR2 name;
+}
+SPOOL_Q_DELETEFORM;
+
+typedef struct spool_r_deleteform
+{
+       uint32 status;
+}
+SPOOL_R_DELETEFORM;
+
 typedef struct spool_q_getjob
 {
        POLICY_HND handle;

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 1dfced705bdadd683896502dc630882d5d140720..05ab71d178c4cb74799caabc895d5e5fb5849c11 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -155,7 +155,7 @@ BOOL add_a_form(nt_forms_struct **list, const FORM *form, int *count)
 
        update=False;
        
-       unistr2_to_ascii(form_name, &(form->name), sizeof(form_name)-1);
+       unistr2_to_ascii(form_name, &form->name, sizeof(form_name)-1);
        for (n=0; n<*count && update==False; n++)
        {
                if (!strncmp((*list)[n].name, form_name, strlen(form_name)))
@@ -169,7 +169,7 @@ BOOL add_a_form(nt_forms_struct **list, const FORM *form, int *count)
        {
                if((*list=Realloc(*list, (n+1)*sizeof(nt_forms_struct))) == NULL)
                        return False;
-               unistr2_to_ascii((*list)[n].name, &(form->name), sizeof((*list)[n].name)-1);
+               unistr2_to_ascii((*list)[n].name, &form->name, sizeof((*list)[n].name)-1);
                (*count)++;
        }
        
@@ -184,6 +184,53 @@ BOOL add_a_form(nt_forms_struct **list, const FORM *form, int *count)
        return True;
 }
 
+/****************************************************************************
+ delete a named form struct 
+****************************************************************************/
+BOOL delete_a_form(nt_forms_struct **list, UNISTR2 *del_name, int *count, uint32 *ret)
+{
+       pstring key;
+       TDB_DATA kbuf;
+       int n=0;
+       fstring form_name;
+
+       *ret = 0;
+
+       if (*count == 1) {
+               /*
+                * Don't delete the last form (no empty lists).
+                * CHECKME ! Is this correct ? JRA.
+                */
+               *ret = ERROR_INVALID_PARAMETER;
+               return False;
+       }
+
+       unistr2_to_ascii(form_name, del_name, sizeof(form_name)-1);
+
+       for (n=0; n<*count; n++) {
+               if (!strncmp((*list)[n].name, form_name, strlen(form_name))) {
+                       DEBUG(103, ("delete_a_form, [%s] in list\n", form_name));
+                       break;
+               }
+       }
+
+       if (n == *count) {
+               DEBUG(10,("delete_a_form, [%s] not found\n", form_name));
+               *ret = ERROR_INVALID_PARAMETER;
+               return False;
+       }
+
+       slprintf(key, sizeof(key), "%s%s", FORMS_PREFIX, (*list)[n].name);
+       kbuf.dsize = strlen(key)+1;
+       kbuf.dptr = key;
+       if (tdb_delete(tdb, kbuf) != 0) {
+               *ret = ERROR_NOT_ENOUGH_MEMORY;
+               return False;
+       }
+
+       return True;
+}
+
 /****************************************************************************
 update a form struct 
 ****************************************************************************/

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 60b6eed0c910b5e031e4f7e2c71fc96a9b4dfdb8..f123198fdb98fe1d7a85a16b2a2801b910435a4c 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -5158,6 +5158,38 @@ static BOOL spoolss_io_addform(char *desc, FORM *f, uint32 ptr, prs_struct *ps,
        return True;
 }
 
+/*******************************************************************
+********************************************************************/  
+BOOL spoolss_io_q_deleteform(char *desc, SPOOL_Q_DELETEFORM *q_u, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "spoolss_io_q_deleteform");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
+               return False;
+       if(!smb_io_unistr2("form name", &q_u->name, True, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+********************************************************************/  
+BOOL spoolss_io_r_deleteform(char *desc, SPOOL_R_DELETEFORM *r_u, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "spoolss_io_r_deleteform");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_uint32("status",        ps, depth, &r_u->status))
+               return False;
+
+       return True;
+}
+
 /*******************************************************************
 ********************************************************************/  
 BOOL spoolss_io_q_addform(char *desc, SPOOL_Q_ADDFORM *q_u, prs_struct *ps, int depth)

diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index e6a0f3ae6d4c8eeae0beae6e4beb9455f158b82f..1e5ef1c67389c53f715e720adfcdbfcd089d25f2 100755 (executable)
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -1055,6 +1055,33 @@ static BOOL api_spoolss_addform(pipes_struct *p)
        return True;
 }
 
+/****************************************************************************
+****************************************************************************/
+static BOOL api_spoolss_deleteform(pipes_struct *p)
+{
+       SPOOL_Q_DELETEFORM q_u;
+       SPOOL_R_DELETEFORM r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+       
+       if(!spoolss_io_q_deleteform("", &q_u, data, 0)) {
+               DEBUG(0,("spoolss_io_q_deleteform: unable to unmarshall SPOOL_Q_DELETEFORM.\n"));
+               return False;
+       }
+       
+       r_u.status = _spoolss_deleteform(&q_u.handle, &q_u.name);
+       
+       if(!spoolss_io_r_deleteform("", &r_u, rdata, 0)) {
+               DEBUG(0,("spoolss_io_r_deleteform: unable to marshall SPOOL_R_DELETEFORM.\n"));
+               return False;
+       }
+
+       return True;
+}
+
 /****************************************************************************
 ****************************************************************************/
 static BOOL api_spoolss_setform(pipes_struct *p)
@@ -1265,6 +1292,7 @@ struct api_struct api_spoolss_cmds[] =
  {"SPOOLSS_ENUMPRINTERDATA",           SPOOLSS_ENUMPRINTERDATA,           api_spoolss_enumprinterdata           },
  {"SPOOLSS_SETPRINTERDATA",            SPOOLSS_SETPRINTERDATA,            api_spoolss_setprinterdata            },
  {"SPOOLSS_ADDFORM",                   SPOOLSS_ADDFORM,                   api_spoolss_addform                   },
+ {"SPOOLSS_DELETEFORM",                SPOOLSS_DELETEFORM,                api_spoolss_deleteform                },
  {"SPOOLSS_SETFORM",                   SPOOLSS_SETFORM,                   api_spoolss_setform                   },
  {"SPOOLSS_ENUMPRINTPROCESSORS",       SPOOLSS_ENUMPRINTPROCESSORS,       api_spoolss_enumprintprocessors       },
  {"SPOOLSS_ENUMMONITORS",              SPOOLSS_ENUMMONITORS,              api_spoolss_enumprintmonitors         },

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 8f58f72d737eb0a6141e617e6dfcbb706b566fa9..0938b37ab340e205bfa6054e8bdb27a0225fadac 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4613,6 +4613,31 @@ uint32 _spoolss_addform( POLICY_HND *handle,
        return 0x0;
 }
 
+/****************************************************************************
+****************************************************************************/
+uint32 _spoolss_deleteform( POLICY_HND *handle, UNISTR2 *form_name)
+{
+       int count=0;
+       uint32 ret = 0;
+       nt_forms_struct *list=NULL;
+       Printer_entry *Printer = find_printer_index_by_hnd(handle);
+
+       DEBUG(5,("spoolss_deleteform\n"));
+
+       if (!OPEN_HANDLE(Printer)) {
+               DEBUG(0,("_spoolss_deleteform: Invalid handle (%s).\n", OUR_HANDLE(handle)));
+               return ERROR_INVALID_HANDLE;
+       }
+
+       count = get_ntforms(&list);
+       if(!delete_a_form(&list, form_name, &count, &ret))
+               return ERROR_INVALID_PARAMETER;
+
+       safe_free(list);
+
+       return ret;
+}
+
 /****************************************************************************
 ****************************************************************************/
 uint32 _spoolss_setform( POLICY_HND *handle,