Alexandre Julliard : server: The name len in the get_directory_entry request must be a data_size_t.
Alexandre Julliard
julliard at winehq.org
Mon Dec 8 09:45:48 CST 2008
Module: wine
Branch: master
Commit: 5c37788a0191689312d1e842c221d6eae7290688
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c37788a0191689312d1e842c221d6eae7290688
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Dec 6 17:29:31 2008 +0100
server: The name len in the get_directory_entry request must be a data_size_t.
---
include/wine/server_protocol.h | 2 +-
server/protocol.def | 2 +-
server/trace.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 41c3fd9..8acb6c0 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -4009,7 +4009,7 @@ struct get_directory_entry_request
struct get_directory_entry_reply
{
struct reply_header __header;
- size_t name_len;
+ data_size_t name_len;
/* VARARG(name,unicode_str,name_len); */
/* VARARG(type,unicode_str); */
};
diff --git a/server/protocol.def b/server/protocol.def
index 5061b54..55ac30d 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2890,7 +2890,7 @@ enum message_type
obj_handle_t handle; /* handle to the directory */
unsigned int index; /* entry index */
@REPLY
- size_t name_len; /* length of the entry name in bytes */
+ data_size_t name_len; /* length of the entry name in bytes */
VARARG(name,unicode_str,name_len); /* entry name */
VARARG(type,unicode_str); /* entry type */
@END
diff --git a/server/trace.c b/server/trace.c
index c13f1ac..3df8603 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -3560,7 +3560,7 @@ static void dump_get_directory_entry_request( const struct get_directory_entry_r
static void dump_get_directory_entry_reply( const struct get_directory_entry_reply *req )
{
- fprintf( stderr, " name_len=%lu,", (unsigned long)req->name_len );
+ fprintf( stderr, " name_len=%u,", req->name_len );
fprintf( stderr, " name=" );
dump_varargs_unicode_str( min(cur_size,req->name_len) );
fputc( ',', stderr );
More information about the wine-cvs
mailing list