September 2006 - Wine-Commits

Andrew Talbot : gdi: Cast-qual warnings fix.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 51857503522c03a3bc7a95bd564f6e1cb89131a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51857503522c03a3bc7a95b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 01:19:34 2006 +0100 gdi: Cast-qual warnings fix. --- dlls/gdi/enhmetafile.c | 188 ++++++++++++++++++++++++------------------------ 1 files changed, 94 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=51857503522c03a3bc7…

1 0

Andrew Talbot : gdi: Cast-qual warnings fix.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 6d070ea250c765ce901a993939585f06801dae32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d070ea250c765ce901a993… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 00:58:30 2006 +0100 gdi: Cast-qual warnings fix. --- dlls/gdi/bitmap.c | 2 +- dlls/gdi/brush.c | 2 +- dlls/gdi/dib.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index 3caa55f..9581032 100644 --- a/dlls/gdi/bitmap.c +++ b/dlls/gdi/bitmap.c @@ -439,7 +439,7 @@ LONG WINAPI SetBitmapBits( { dest -= dib->dsBm.bmWidthBytes; memcpy( dest, bits, min( count, dib->dsBm.bmWidthBytes ) ); - bits = (char *)bits + dib->dsBm.bmWidthBytes; + bits = (const char *)bits + dib->dsBm.bmWidthBytes; count -= dib->dsBm.bmWidthBytes; } } diff --git a/dlls/gdi/brush.c b/dlls/gdi/brush.c index 95c580f..309ece5 100644 --- a/dlls/gdi/brush.c +++ b/dlls/gdi/brush.c @@ -273,7 +273,7 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGL */ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) { - BITMAPINFO *info=(BITMAPINFO*)data; + const BITMAPINFO *info=(const BITMAPINFO*)data; LOGBRUSH logbrush; if (!data) diff --git a/dlls/gdi/dib.c b/dlls/gdi/dib.c index 82d0042..724b755 100644 --- a/dlls/gdi/dib.c +++ b/dlls/gdi/dib.c @@ -129,7 +129,7 @@ int DIB_BitmapInfoSize( const BITMAPINFO if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)info; + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; return sizeof(BITMAPCOREHEADER) + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); @@ -168,7 +168,7 @@ static int DIB_GetBitmapInfo( const BITM } if (header->biSize == sizeof(BITMAPCOREHEADER)) { - BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; *width = core->bcWidth; *height = core->bcHeight; *planes = core->bcPlanes; @@ -179,7 +179,7 @@ static int DIB_GetBitmapInfo( const BITM } if (header->biSize == sizeof(BITMAPV4HEADER)) { - BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header; + const BITMAPV4HEADER *v4hdr = (const BITMAPV4HEADER *)header; *width = v4hdr->bV4Width; *height = v4hdr->bV4Height; *planes = v4hdr->bV4Planes; @@ -190,7 +190,7 @@ static int DIB_GetBitmapInfo( const BITM } if (header->biSize == sizeof(BITMAPV5HEADER)) { - BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header; + const BITMAPV5HEADER *v5hdr = (const BITMAPV5HEADER *)header; *width = v5hdr->bV5Width; *height = v5hdr->bV5Height; *planes = v5hdr->bV5Planes;

1 0

Dan Hipschman : widl: Don't compare result of read() to unsigned type.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 3ad3f8de42658db331110bf14baa5b81be6c809a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ad3f8de42658db331110bf… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 13 16:34:53 2006 -0700 widl: Don't compare result of read() to unsigned type. --- tools/widl/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 1476e1a..f119770 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -255,7 +255,7 @@ void add_typelib_entry(type_t *t) typelib->entry = entry; } -static void tlb_read(int fd, void *buf, size_t count) +static void tlb_read(int fd, void *buf, int count) { if(read(fd, buf, count) < count) error("error while reading importlib.\n");

1 0

Dan Hipschman : widl: Remove unused parameter in create_msft_typeinfo.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: bd7e690c1fbdf68cc8220e1a91b706ad946bc9cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd7e690c1fbdf68cc8220e1… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 13 16:33:44 2006 -0700 widl: Remove unused parameter in create_msft_typeinfo. --- tools/widl/write_msft.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index ec4d204..ad1b584 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1727,7 +1727,7 @@ static HRESULT add_impl_type(msft_typein } static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_kind kind, - const char *name, const attr_t *attr, int idx) + const char *name, const attr_t *attr) { msft_typeinfo_t *msft_typeinfo; int nameoffset; @@ -1905,7 +1905,7 @@ static void add_dispinterface_typeinfo(m dispinterface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_DISPATCH, dispinterface->name, - dispinterface->attrs, typelib->typelib_header.nrtypeinfos); + dispinterface->attrs); msft_typeinfo->typeinfo->size = 4; msft_typeinfo->typeinfo->typekind |= 0x2100; @@ -1970,8 +1970,7 @@ static void add_interface_typeinfo(msft_ } interface->typelib_idx = typelib->typelib_header.nrtypeinfos; - msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs, - typelib->typelib_header.nrtypeinfos); + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs); msft_typeinfo->typeinfo->size = 4; msft_typeinfo->typeinfo->typekind |= 0x2200; @@ -2021,8 +2020,7 @@ static void add_structure_typeinfo(msft_ return; structure->typelib_idx = typelib->typelib_header.nrtypeinfos; - msft_typeinfo = create_msft_typeinfo(typelib, TKIND_RECORD, structure->name, structure->attrs, - typelib->typelib_header.nrtypeinfos); + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_RECORD, structure->name, structure->attrs); msft_typeinfo->typeinfo->size = 0; while(NEXT_LINK(cur)) cur = NEXT_LINK(cur); @@ -2040,8 +2038,7 @@ static void add_enum_typeinfo(msft_typel msft_typeinfo_t *msft_typeinfo; enumeration->typelib_idx = typelib->typelib_header.nrtypeinfos; - msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ENUM, enumeration->name, enumeration->attrs, - typelib->typelib_header.nrtypeinfos); + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ENUM, enumeration->name, enumeration->attrs); msft_typeinfo->typeinfo->size = 0; while(NEXT_LINK(cur)) cur = NEXT_LINK(cur); @@ -2061,8 +2058,7 @@ static void add_typedef_typeinfo(msft_ty return; tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; - msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs, - typelib->typelib_header.nrtypeinfos); + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); encode_type(typelib, get_type_vt(tdef->orig), tdef->orig, &msft_typeinfo->typeinfo->datatype1, &msft_typeinfo->typeinfo->size, &alignment, &msft_typeinfo->typeinfo->datatype2); msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); @@ -2081,8 +2077,7 @@ static void add_coclass_typeinfo(msft_ty return; cls->typelib_idx = typelib->typelib_header.nrtypeinfos; - msft_typeinfo = create_msft_typeinfo(typelib, TKIND_COCLASS, cls->name, cls->attrs, - typelib->typelib_header.nrtypeinfos); + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_COCLASS, cls->name, cls->attrs); if((iref = cls->ifaces)) { num_ifaces++; @@ -2162,8 +2157,7 @@ static void add_module_typeinfo(msft_typ return; module->typelib_idx = typelib->typelib_header.nrtypeinfos; - msft_typeinfo = create_msft_typeinfo(typelib, TKIND_MODULE, module->name, module->attrs, - typelib->typelib_header.nrtypeinfos); + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_MODULE, module->name, module->attrs); msft_typeinfo->typeinfo->typekind |= 0x0a00; if((func = module->funcs)) {

1 0

Dan Hipschman : widl: Remove unused parameter in ctl2_encode_name.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 48006f60a7462d889264a1c4839de015ee481cc1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48006f60a7462d889264a1c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 13 16:32:49 2006 -0700 widl: Remove unused parameter in ctl2_encode_name. --- tools/widl/write_msft.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 0530214..ec4d204 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -329,7 +329,6 @@ static int ctl2_encode_name( * safe in the slightest. */ static int ctl2_encode_string( - msft_typelib_t *typelib, /* [I] The typelib to operate against (not used?). */ const char *string, /* [I] The string to encode. */ char **result) /* [O] A pointer to a pointer to receive the encoded string. */ { @@ -559,7 +558,7 @@ static int ctl2_alloc_string( char *string_space; char *encoded_string; - length = ctl2_encode_string(typelib, string, &encoded_string); + length = ctl2_encode_string(string, &encoded_string); for (offset = 0; offset < typelib->typelib_segdir[MSFT_SEG_STRING].length; offset += ((((typelib->typelib_segment_data[MSFT_SEG_STRING][offset + 1] << 8) & 0xff) @@ -633,7 +632,7 @@ static int alloc_importfile( MSFT_ImpFile *importfile; char *encoded_string; - length = ctl2_encode_string(typelib, filename, &encoded_string); + length = ctl2_encode_string(filename, &encoded_string); encoded_string[0] <<= 2; encoded_string[0] |= 1;

1 0

Dan Hipschman : widl: Replace a #if by if for better compiler checking.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 954c592a6c076626e2789415f86612404d30f8a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=954c592a6c076626e278941… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 13 16:31:47 2006 -0700 widl: Replace a #if by if for better compiler checking. --- tools/widl/utils.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 98a66dd..007d1cb 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -34,10 +34,9 @@ #include "widl.h" #include "utils.h" #include "parser.h" -/* #define WANT_NEAR_INDICATION */ +static const int want_near_indication = 0; -#ifdef WANT_NEAR_INDICATION -void make_print(char *str) +static void make_print(char *str) { while(*str) { @@ -46,13 +45,13 @@ void make_print(char *str) str++; } } -#endif static void generic_msg(const char *s, const char *t, const char *n, va_list ap) { fprintf(stderr, "%s:%d: %s: ", input_name ? input_name : "stdin", line_number, t); vfprintf(stderr, s, ap); -#ifdef WANT_NEAR_INDICATION + + if (want_near_indication) { char *cpy; if(n) @@ -63,7 +62,7 @@ #ifdef WANT_NEAR_INDICATION free(cpy); } } -#endif + fprintf(stderr, "\n"); }

1 0

Dan Hipschman : widl: Remove unused parameter in write_ip_tfs.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 6e7389ada8a7942031399a8763efa82eeb2ddfad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e7389ada8a7942031399a8… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 13 16:29:54 2006 -0700 widl: Remove unused parameter in write_ip_tfs. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 84a2958..3cc2f61 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1271,7 +1271,7 @@ static size_t write_union_tfs(FILE *file return *typeformat_offset; } -static size_t write_ip_tfs(FILE *file, const attr_t *attrs, const type_t *type, +static size_t write_ip_tfs(FILE *file, const attr_t *attrs, const char *name, unsigned int *typeformat_offset) { size_t i; @@ -1401,7 +1401,7 @@ static size_t write_typeformatstring_var if (base->type == RPC_FC_IP) { - return write_ip_tfs(file, base->attrs, base, base->name, typeformat_offset); + return write_ip_tfs(file, base->attrs, base->name, typeformat_offset); } /* special case for pointers to base types */

1 0

Dan Hipschman : widl: Fix warning about unused structure field in lexer.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 53a28192865d212021ff4f3a573dd78f80584be0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53a28192865d212021ff4f3… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 13 16:28:39 2006 -0700 widl: Fix warning about unused structure field in lexer. --- tools/widl/parser.l | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 21faf7b..17c97b8 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -171,7 +171,6 @@ #endif static struct keyword { const char *kw; int token; - int val; } keywords[] = { {"FALSE", tFALSE}, {"TRUE", tTRUE},

1 0

Dan Hipschman : widl: Add -u and -U options to man page.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: a472c83f9174e82ecd91dc37728afeba5a661fd5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a472c83f9174e82ecd91dc3… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 13 14:43:36 2006 -0700 widl: Add -u and -U options to man page. --- tools/widl/widl.man.in | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 2d9ac80..be53445 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -34,6 +34,13 @@ Generate a type library. Define the name of the type library to be generated. The default filename is infile.tlb. .PP +.B UUID file options: +.IP "\fB-u\fR" +Generate a UUID file. +.IP "\fB-U \fIfile\fR" +Define the name of the UUID file to be generated. +The default filename is infile_i.c. +.PP .B Proxy/stub generation options: .IP "\fB-c\fR" Generate client stub.

1 0

Stefan Leichter : dmscript: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 6a87f2b979e0c66c6136cc5df0755563d58d6c1b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a87f2b979e0c66c6136cc5… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Sep 13 22:30:06 2006 +0200 dmscript: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dmscript/dmscript_main.c | 3 ++- dlls/dmscript/scripttrack.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index aa579b7..5980e00 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -1024,7 +1024,8 @@ const char *debugstr_DMUS_OBJECTDESC (LP if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = %lli\n - pbMemData = %p\n", pDesc->llMemLength, pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); return wine_dbg_sprintf("%s", buffer); diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 81742ef..84c33bb 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -169,19 +169,22 @@ static HRESULT WINAPI IDirectMusicScript static HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { ICOM_THIS_MULTI(IDirectMusicScriptTrack, TrackVtbl, iface); - FIXME("(%p, %p, %lli, %lli, %lli, %ld, %p, %p, %ld): stub\n", This, pStateData, rtStart, rtEnd, rtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } static HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { ICOM_THIS_MULTI(IDirectMusicScriptTrack, TrackVtbl, iface); - FIXME("(%p, %s, %lli, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), rtTime, prtNext, pParam, pStateData, dwFlags); + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { ICOM_THIS_MULTI(IDirectMusicScriptTrack, TrackVtbl, iface); - FIXME("(%p, %s, %lli, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), rtTime, pParam, pStateData, dwFlags); + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; }

1 0