[SCM] Samba Shared Repository - branch v3-0-test updated -
release-3-0-28a-1155-g366aa23
Jeremy Allison
jra at samba.org
Tue May 6 18:23:52 GMT 2008
The branch, v3-0-test has been updated
via 366aa23becaf99867fdc09e4e6cb06aa10b7edac (commit)
from 69270e390c468f71db95452525903d87d2d6c42c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 366aa23becaf99867fdc09e4e6cb06aa10b7edac
Author: Jeremy Allison <jra at samba.org>
Date: Tue May 6 11:23:24 2008 -0700
Merge 3fc1ab210b8772ee9f867499c0b1a7bb4bcdd285 from 3.2.
The first of Martin Zielinski <mz at seh.de> Vista printing patches.
Jerry will test and should get into 3.2 final (and the next 3.0.x
release).
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/rpc_parse/parse_spoolss.c | 7 ++++++-
source/rpc_server/srv_spoolss_nt.c | 9 +++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c
index 3814151..ba8a327 100644
--- a/source/rpc_parse/parse_spoolss.c
+++ b/source/rpc_parse/parse_spoolss.c
@@ -2130,7 +2130,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;
diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index 40ad81a..5ccc91c 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -9476,8 +9476,13 @@ 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;
--
Samba Shared Repository
More information about the samba-cvs
mailing list