June 2006 - Wine-commits - list.winehq.org

Robert Shearman : rpcrt4: getaddrinfo returns any non-zero value on failure , not just negative values.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: b3c04e032d31e7b45c0be83872c448c2c11ff7fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3c04e032d31e7b45c0be83… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jun 13 10:59:42 2006 +0100 rpcrt4: getaddrinfo returns any non-zero value on failure, not just negative values. --- dlls/rpcrt4/rpc_transport.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6247362..4249d2a 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -481,7 +481,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op hints.ai_next = NULL; ret = getaddrinfo(Connection->NetworkAddr, Connection->Endpoint, &hints, &ai); - if (ret < 0) + if (ret) { ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); return RPC_S_SERVER_UNAVAILABLE; @@ -606,10 +606,10 @@ static size_t rpcrt4_ncacn_ip_tcp_get_to hints.ai_next = NULL; ret = getaddrinfo(networkaddr, endpoint, &hints, &ai); - if (ret < 0) + if (ret) { ret = getaddrinfo("0.0.0.0", endpoint, &hints, &ai); - if (ret < 0) + if (ret) { ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); return 0;

1 0

Alexandre Julliard : ntdll: Cast termios. c_cflag to avoid a printf format warning.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 2208694ab245b582f31e15f8aa86931c66847c50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2208694ab245b582f31e15f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:16:57 2006 +0200 ntdll: Cast termios.c_cflag to avoid a printf format warning. --- dlls/ntdll/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index e663531..e9dfc9a 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -264,7 +264,7 @@ #endif case CS6: slc->WordLength = 6; break; case CS7: slc->WordLength = 7; break; case CS8: slc->WordLength = 8; break; - default: ERR("unknown size %x\n", port.c_cflag & CSIZE); + default: ERR("unknown size %x\n", (UINT)(port.c_cflag & CSIZE)); } if (port.c_cflag & CSTOPB)

1 0

Alexandre Julliard : winedbg: sscanf arguments should be ints, not size_t.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 68090e5d68c1d1b5b2ba52c4294ce781ee459383 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68090e5d68c1d1b5b2ba52c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:16:06 2006 +0200 winedbg: sscanf arguments should be ints, not size_t. --- programs/winedbg/gdbproxy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index e99ac73..5e4cf29 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1273,7 +1273,7 @@ static enum packet_return packet_thread( static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; - size_t len, blk_len, nread; + unsigned int len, blk_len, nread; char buffer[32]; unsigned long r = 0; @@ -1304,7 +1304,7 @@ static enum packet_return packet_read_me static enum packet_return packet_write_memory(struct gdb_context* gdbctx) { char* addr; - size_t len, blk_len; + unsigned int len, blk_len; char* ptr; char buffer[32]; unsigned long w;

1 0

Alexandre Julliard : winebuild: Fix a few printf format warnings by casting size_t.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: fb15dabdcddc18d17c2ae9c5c9241dd881dbd8c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb15dabdcddc18d17c2ae9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:14:59 2006 +0200 winebuild: Fix a few printf format warnings by casting size_t. --- tools/winebuild/relay.c | 8 ++++---- tools/winebuild/res32.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index fa7561d..50794ba 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -214,7 +214,7 @@ static void BuildCallFrom16Core( FILE *o if ( thunk ) { /* Set up registers as expected and call thunk */ - fprintf( outfile, "\tleal %d(%%edx), %%ebx\n", sizeof(STACK16FRAME)-22 ); + fprintf( outfile, "\tleal %d(%%edx), %%ebx\n", (int)sizeof(STACK16FRAME)-22 ); fprintf( outfile, "\tleal -4(%%esp), %%ebp\n" ); fprintf( outfile, "\tcall *%d(%%edx)\n", STACK16OFFSET(entry_point) ); @@ -248,7 +248,7 @@ static void BuildCallFrom16Core( FILE *o /* Build register CONTEXT */ if ( reg_func ) { - fprintf( outfile, "\tsubl $%d, %%esp\n", sizeof(CONTEXT86) ); + fprintf( outfile, "\tsubl $%d, %%esp\n", (int)sizeof(CONTEXT86) ); fprintf( outfile, "\tmovl %%ecx, %d(%%esp)\n", CONTEXTOFFSET(EFlags) ); @@ -301,7 +301,7 @@ #endif } /* Call relay routine (which will call the API entry point) */ - fprintf( outfile, "\tleal %d(%%edx), %%eax\n", sizeof(STACK16FRAME) ); + fprintf( outfile, "\tleal %d(%%edx), %%eax\n", (int)sizeof(STACK16FRAME) ); fprintf( outfile, "\tpushl %%eax\n" ); fprintf( outfile, "\tpushl %d(%%edx)\n", STACK16OFFSET(entry_point) ); fprintf( outfile, "\tcall *%d(%%edx)\n", STACK16OFFSET(relay) ); @@ -309,7 +309,7 @@ #endif if ( reg_func ) { fprintf( outfile, "\tleal -%d(%%ebp), %%ebx\n", - sizeof(CONTEXT) + STACK32OFFSET(ebp) ); + (int)sizeof(CONTEXT) + STACK32OFFSET(ebp) ); /* Switch stack back */ fprintf( outfile, "\t.byte 0x64\n\tmovw (%d), %%ss\n", STACKOFFSET+2 ); diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index ef98195..c283498 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -428,8 +428,8 @@ void output_resources( FILE *outfile, DL output_res_dir( outfile, 0, name->nb_languages ); for (k = 0, res = name->res; k < name->nb_languages; k++, res++) { - fprintf( outfile, "\t.long 0x%08x,0x%08x\n", res->lang, - data_offset + (res - spec->resources) * sizeof(IMAGE_RESOURCE_DATA_ENTRY) ); + unsigned int entry_offset = (res - spec->resources) * sizeof(IMAGE_RESOURCE_DATA_ENTRY); + fprintf( outfile, "\t.long 0x%08x,0x%08x\n", res->lang, data_offset + entry_offset ); } } }

1 0

Alexandre Julliard : wined3d: Use unsigned int instead of size_t to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 836b5c7e93e090c72598bd4e269abb2d9fd40fa5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=836b5c7e93e090c72598bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:14:20 2006 +0200 wined3d: Use unsigned int instead of size_t to avoid printf format warnings. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb9abc6..9155caf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1282,7 +1282,7 @@ typedef struct shader_reg_maps { #define SHADER_PGMSIZE 65535 typedef struct SHADER_BUFFER { char* buffer; - size_t bsize; + unsigned int bsize; unsigned int lineNo; } SHADER_BUFFER;

1 0

Alexandre Julliard : oleaut32: Use unsigned int instead of size_t to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: fb5366c6c3557c99ffcb27b906548ec64fb925f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb5366c6c3557c99ffcb27b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:14:13 2006 +0200 oleaut32: Use unsigned int instead of size_t to avoid printf format warnings. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index df70e90..e08a7c0 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7053,7 +7053,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* s 1,2,3,4,5,6,7,8,9,10,11,12,13, 1,2,3,4,5,6,7,8,9,10,11,12,13 }; - size_t i; + unsigned int i; BSTR tokens[sizeof(ParseDateTokens)/sizeof(ParseDateTokens[0])]; DATEPARSE dp; DWORD dwDateSeps = 0, iDate = 0;

1 0

Alexandre Julliard : msvcrt: Use unsigned int instead of size_t to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: db78a84d4753cbae4e30b3eb7ca3376ba7c1799d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db78a84d4753cbae4e30b3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:14:06 2006 +0200 msvcrt: Use unsigned int instead of size_t to avoid printf format warnings. --- dlls/msvcrt/cppexcept.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 9536847..8482cc7 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -106,7 +106,7 @@ typedef struct __cxx_type_info UINT flags; /* flags (see CLASS_* flags below) */ const type_info *type_info; /* C++ type info */ this_ptr_offsets offsets; /* offsets for computing the this pointer */ - size_t size; /* object size */ + unsigned int size; /* object size */ cxx_copy_ctor copy_ctor; /* copy constructor */ } cxx_type_info; #define CLASS_IS_SIMPLE_TYPE 1

1 0

Alexandre Julliard : crypt32: Use unsigned int instead of size_t to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: dbd473ff79225abc91c00af9dc94ea251105545a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbd473ff79225abc91c00af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:14:00 2006 +0200 crypt32: Use unsigned int instead of size_t to avoid printf format warnings. --- dlls/crypt32/context.c | 2 +- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/store.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 558be9d..1b2f7d1 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -74,7 +74,7 @@ void *Context_CreateDataContext(size_t c return ret; } -void *Context_CreateLinkContext(size_t contextSize, void *linked, size_t extra, +void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned int extra, BOOL addRef) { void *context = CryptMemAlloc(contextSize + sizeof(LINK_CONTEXT) + extra); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 8ac0484..3ef44b4 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -115,7 +115,7 @@ void *Context_CreateDataContext(size_t c * it should be) linked is addref'd. * Free with Context_Release. */ -void *Context_CreateLinkContext(size_t contextSize, void *linked, size_t extra, +void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned int extra, BOOL addRef); /* Returns a pointer to the extra bytes allocated with context, which must be diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 2ea714e..95b91da 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -377,7 +377,7 @@ static void *CRYPT_CollectionCreateConte } static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, - size_t contextStoreOffset, void *context, void *toReplace, size_t contextSize, + unsigned int contextStoreOffset, void *context, void *toReplace, unsigned int contextSize, void **pChildContext) { BOOL ret;

1 0

Alexandre Julliard : widl: Use unsigned int instead of size_t to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 043fd66907c2ca2697a8c8dd47b388487d8dcc81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=043fd66907c2ca2697a8c8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:13:49 2006 +0200 widl: Use unsigned int instead of size_t to avoid printf format warnings. --- tools/widl/server.c | 4 +++- tools/widl/typegen.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 6d00748..97f5102 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -154,13 +154,15 @@ static void assign_out_args(const func_t if (has_size) { + unsigned int size; type_t *type = var->type; while (type->type == 0 && type->ref) type = type->ref; fprintf(server, " = NdrAllocate(&_StubMsg, "); write_expr(server, size_is, 1); - fprintf(server, " * %u);\n", get_type_memsize(type)); + size = get_type_memsize(type); + fprintf(server, " * %u);\n", size); } else if (!is_string) { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 19e4664..20db78c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -596,7 +596,7 @@ size_t get_type_memsize(const type_t *ty static int write_pointers(FILE *file, const attr_t *attrs, const type_t *type, int ptr_level, const expr_t *array, int level, - size_t *typestring_offset) + unsigned int *typestring_offset) { int pointers_written = 0; const var_t *v; @@ -702,7 +702,7 @@ static size_t write_pointer_description( static size_t write_string_tfs(FILE *file, const attr_t *attrs, const type_t *type, const expr_t *array, - const char *name, size_t *typestring_offset) + const char *name, unsigned int *typestring_offset) { const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS); int has_size = size_is && (size_is->type != EXPR_VOID); @@ -782,7 +782,7 @@ static size_t write_string_tfs(FILE *fil static size_t write_array_tfs(FILE *file, const attr_t *attrs, const type_t *type, const expr_t *array, - const char *name, size_t *typestring_offset) + const char *name, unsigned int *typestring_offset) { const expr_t *length_is = get_attrp(attrs, ATTR_LENGTHIS); const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS); @@ -1050,9 +1050,9 @@ #undef CASE_BASETYPE } static size_t write_struct_tfs(FILE *file, const type_t *type, - const char *name, size_t *typestring_offset) + const char *name, unsigned int *typestring_offset) { - size_t total_size; + unsigned int total_size; const var_t *array; size_t start_offset; size_t array_offset; @@ -1210,7 +1210,7 @@ static size_t write_struct_tfs(FILE *fil } } -static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offset, size_t *typeformat_offset) +static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offset, unsigned int *typeformat_offset) { int in_attr, out_attr; unsigned char flags = 0; @@ -1234,14 +1234,14 @@ static void write_pointer_only_tfs(FILE static size_t write_union_tfs(FILE *file, const attr_t *attrs, const type_t *type, const char *name, - size_t *typeformat_offset) + unsigned int *typeformat_offset) { error("write_union_tfs: Unimplemented\n"); return *typeformat_offset; } static size_t write_typeformatstring_var(FILE *file, int indent, - const var_t *var, size_t *typeformat_offset) + const var_t *var, unsigned int *typeformat_offset) { const type_t *type = var->type; int ptr_level = var->ptr_level; @@ -1350,7 +1350,7 @@ void write_typeformatstring(FILE *file, { int indent = 0; var_t *var; - size_t typeformat_offset; + unsigned int typeformat_offset; const ifref_t *iface = ifaces; print_file(file, indent, "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); @@ -1855,7 +1855,7 @@ size_t get_size_procformatstring_var(con size_t get_size_typeformatstring_var(const var_t *var) { - size_t type_offset = 0; + unsigned int type_offset = 0; write_typeformatstring_var(NULL, 0, var, &type_offset); return type_offset; }

1 0

Alexandre Julliard : winevdm: Don' t use sizeof in traces to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: c425045abb44405e8555f1dea9e28c3c897ca2a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c425045abb44405e8555f1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:12:07 2006 +0200 winevdm: Don't use sizeof in traces to avoid printf format warnings. --- programs/winevdm/winevdm.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index e81f90f..747ac6d 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -119,9 +119,7 @@ static BOOL read_pif_file( HANDLE hFile, pifhead_t pifheader; if( !GetFileSizeEx( hFile, &filesize) || filesize.QuadPart < (sizeof(pifhead_t) + sizeof(recordhead_t))) { - WINE_ERR("Invalid pif file: size error %d must be >= %d\n", - (int)filesize.QuadPart, - (sizeof(pifhead_t) + sizeof(recordhead_t))); + WINE_ERR("Invalid pif file: size error %d\n", (int)filesize.QuadPart); return FALSE; } SetFilePointer( hFile, 0, NULL, FILE_BEGIN);

1 0