sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

The first of Martin Zielinski <mz@seh.de> Vista printing patches.

Browse Source 
Jerry will test and should get into 3.2 final (and the next 3.0.x
release).
Jeremy.
This commit is contained in:
Jeremy Allison 2008-04-24 14:04:47 -07:00
parent d8b2ff3c87
commit 3fc1ab210b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/rpc_parse/parse_spoolss.c
View File

@ -2129,7 +2129,12 @@ static bool smb_io_reldevmode(const char *desc, RPC_BUFFER *buffer, int depth, D
}
buffer->string_at_end -= ((*devmode)->size + (*devmode)->driverextra);
/* mz: we have to align the device mode for VISTA */
if (buffer->string_at_end % 4) {
buffer->string_at_end += 4 - (buffer->string_at_end % 4);
}
if(!prs_set_offset(ps, buffer->string_at_end))
return False;

9
source/rpc_server/srv_spoolss_nt.c
View File

@ -9626,13 +9626,16 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
/* copy data into the reply */
r_u->ctr.size = r_u->needed;
/* mz: Vista x64 returns 0x6f7 (The stub received bad data), if the
response buffer size is != the offered buffer size
r_u->ctr.size = r_u->needed;
*/
r_u->ctr.size = in_size;
r_u->ctr.size_of_array = r_u->returned;
r_u->ctr.values = enum_values;
done:
if ( printer )
free_a_printer(&printer, 2);