December 2008 - Wine-Commits

Michael Stefaniuc : atl: Remove two superfluous casts.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: fa1d0498470b120d2ad01648782c9eff17bcf2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa1d0498470b120d2ad016487… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:50:43 2008 +0100 atl: Remove two superfluous casts. --- dlls/atl/atl_ax.c | 2 +- dlls/atl/registrar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index a5ae342..c98cba7 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1244,7 +1244,7 @@ HWND WINAPI AtlAxCreateDialogW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPRO hgl = LoadResource (hInst, hrsrc); if ( !hgl ) return NULL; - ptr = (LPCDLGTEMPLATEW)LockResource ( hgl ); + ptr = LockResource ( hgl ); if (!ptr) { FreeResource( hgl ); diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index dd8b7a2..d3ca9b0 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -439,7 +439,7 @@ static HRESULT resource_register(Registrar *This, LPCOLESTR resFileName, if(hins) { src = FindResourceW(hins, szID, szType); if(src) { - regstra = (LPSTR)LoadResource(hins, src); + regstra = LoadResource(hins, src); reslen = SizeofResource(hins, src); if(regstra) { len = MultiByteToWideChar(CP_ACP, 0, regstra, reslen, NULL, 0)+1;

1 0

Michael Stefaniuc : msxml3: Do not cast void pointers to other pointer types.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 328f60a6865e0c939d6807d6c160cff4c8497085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=328f60a6865e0c939d6807d6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:47:27 2008 +0100 msxml3: Do not cast void pointers to other pointer types. --- dlls/msxml3/element.c | 2 +- dlls/msxml3/node.c | 2 +- dlls/msxml3/saxreader.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4b9bf6c..a31f80e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -478,7 +478,7 @@ static HRESULT WINAPI domelem_get_tagName( len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, NULL, 0 ); if (element->ns) len += MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, NULL, 0 ); - str = (LPWSTR) HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); + str = HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); if ( !str ) return E_OUTOFMEMORY; if (element->ns) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index aa3b748..3169f35 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -257,7 +257,7 @@ BSTR bstr_from_xmlChar( const xmlChar *buf ) return NULL; len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) buf, -1, NULL, 0 ); - str = (LPWSTR) HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); + str = HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); if ( !str ) return NULL; MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) buf, -1, str, len ); diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 8370af0..17a3334 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -161,7 +161,7 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); if(len != -1) dLen++; - str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dLen * sizeof (WCHAR)); + str = HeapAlloc(GetProcessHeap(), 0, dLen * sizeof (WCHAR)); if (!str) return NULL; MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, dLen);

1 0

Michael Stefaniuc : quartz: Don't cast zero.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 1a18b797eb0f209eb04a0c02c3619756eb3598d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a18b797eb0f209eb04a0c02c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:47:42 2008 +0100 quartz: Don't cast zero. --- dlls/quartz/systemclock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 88ac7ad..a971993 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -260,7 +260,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFEREN TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtBaseTime), wine_dbgstr_longlong(rtStreamTime), hEvent, pdwAdviseCookie); - if ((HEVENT) 0 == hEvent) { + if (!hEvent) { return E_INVALIDARG; } if (0 >= rtBaseTime + rtStreamTime) { @@ -296,7 +296,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REF TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtStartTime), wine_dbgstr_longlong(rtPeriodTime), hSemaphore, pdwAdviseCookie); - if ((HSEMAPHORE) 0 == hSemaphore) { + if (!hSemaphore) { return E_INVALIDARG; } if (0 >= rtStartTime || 0 >= rtPeriodTime) {

1 0

Michael Stefaniuc : msvcrt: Use NULL instead of casting zero.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 276b938e1dc12985ec736846a1a49bdd5df9a266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=276b938e1dc12985ec736846a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:47:01 2008 +0100 msvcrt: Use NULL instead of casting zero. --- dlls/msvcrt/tests/scanf.c | 2 +- dlls/msvcrt/time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index b152eac..cb005f9 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -51,7 +51,7 @@ static void test_sscanf( void ) ok( ptr == (void *)0x46F172,"sscanf reads %p instead of %x\n", ptr, 0x46F172 ); ok( sscanf("0x46F173", "%p", &ptr) == 1, "sscanf failed\n" ); - ok( ptr == (void *)0,"sscanf reads %p instead of %x\n", ptr, 0 ); + ok( ptr == NULL,"sscanf reads %p instead of %x\n", ptr, 0 ); ok( sscanf("-46F174", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0xFFB90E8C,"sscanf reads %p instead of %x\n", ptr, 0xFFB90E8C ); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index ba4e95c..b53cbcd 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -340,7 +340,7 @@ void CDECL MSVCRT__tzset(void) struct tm *tmp; long zone_january, zone_july; - t = (time((time_t *)0) / seconds_in_year) * seconds_in_year; + t = (time(NULL) / seconds_in_year) * seconds_in_year; tmp = localtime(&t); zone_january = -tmp->tm_gmtoff; t += seconds_in_year / 2;

1 0

Michael Stefaniuc : mshtml: Remove two superfluous casts.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 27d8b7436f728ee19a570ff976e530cf34394776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d8b7436f728ee19a570ff97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:46:08 2008 +0100 mshtml: Remove two superfluous casts. --- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/view.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2cddbdf..923604d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -94,7 +94,7 @@ static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP This = *(NSContainer**)lParam; SetPropW(hwnd, wszTHIS, This); }else { - This = (NSContainer*)GetPropW(hwnd, wszTHIS); + This = GetPropW(hwnd, wszTHIS); } switch(msg) { diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 6bc5e92..72a4a40 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -189,7 +189,7 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM This = *(HTMLDocument**)lParam; SetPropW(hwnd, wszTHIS, This); }else { - This = (HTMLDocument*)GetPropW(hwnd, wszTHIS); + This = GetPropW(hwnd, wszTHIS); } switch(msg) {

1 0

Michael Stefaniuc : msrle32: Remove some superfluous casts.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 819ad6417b650d75d2416256f37d17c109886164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819ad6417b650d75d2416256f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:46:40 2008 +0100 msrle32: Remove some superfluous casts. --- dlls/msrle32/msrle32.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 41ad22e..6fa8e87 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1136,7 +1136,7 @@ static CodecInfo* Open(LPICOPEN icinfo) return NULL; } - pi = (CodecInfo*)LocalAlloc(LPTR, sizeof(CodecInfo)); + pi = LocalAlloc(LPTR, sizeof(CodecInfo)); if (pi != NULL) { pi->fccHandler = icinfo->fccHandler; @@ -1165,7 +1165,7 @@ static LRESULT Close(CodecInfo *pi) if (pi->pPrevFrame != NULL || pi->pCurFrame != NULL) CompressEnd(pi); - LocalFree((HLOCAL)pi); + LocalFree(pi); return 1; } @@ -1419,7 +1419,7 @@ static LRESULT CompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, switch (lpbiOut->biBitCount) { case 4: case 8: - pi->palette_map = (LPBYTE)LocalAlloc(LPTR, lpbiIn->biClrUsed); + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); if (pi->palette_map == NULL) { CompressEnd(pi); return ICERR_MEMORY; @@ -1669,7 +1669,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, switch (lpbiOut->biBitCount) { case 4: case 8: - pi->palette_map = (LPBYTE)LocalAlloc(LPTR, lpbiIn->biClrUsed); + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); if (pi->palette_map == NULL) return ICERR_MEMORY; @@ -1679,7 +1679,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, break; case 15: case 16: - pi->palette_map = (LPBYTE)LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); if (pi->palette_map == NULL) return ICERR_MEMORY; @@ -1699,7 +1699,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, break; case 24: case 32: - pi->palette_map = (LPBYTE)LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); if (pi->palette_map == NULL) return ICERR_MEMORY; memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); @@ -1753,7 +1753,7 @@ static LRESULT DecompressEnd(CodecInfo *pi) pi->bDecompress = FALSE; if (pi->palette_map != NULL) { - LocalFree((HLOCAL)pi->palette_map); + LocalFree(pi->palette_map); pi->palette_map = NULL; }

1 0

Michael Stefaniuc : hal: Don't cast zero.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: f142ad923add383f1cae80e96d294d3934684a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f142ad923add383f1cae80e96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:45:49 2008 +0100 hal: Don't cast zero. --- dlls/hal/hal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 0b64809..6390edf 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -62,7 +62,7 @@ KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) { FIXME( "(%p) stub!\n", SpinLock ); - return (KIRQL)0; + return 0; } @@ -86,7 +86,7 @@ KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) { FIXME( "(%u) stub!\n", NewIrql ); - return (KIRQL)0; + return 0; }

1 0

Alexandre Julliard : fnt2bdf: Get rid of useless string constants.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: a5f1e9b62ccbe82646bf50bc95f4808412109939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f1e9b62ccbe82646bf50bc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 5 12:36:05 2008 +0100 fnt2bdf: Get rid of useless string constants. --- tools/fnt2bdf.c | 44 ++++++++++++++++++-------------------------- 1 files changed, 18 insertions(+), 26 deletions(-) diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index 1a14d6c..f204720 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -47,21 +47,13 @@ /* global options */ -int dump_bdf( fnt_fontS* cpe_font_struct, unsigned char* file_buffer); -int dump_bdf_hdr(FILE* fs, fnt_fontS* cpe_font_struct, unsigned char* file_buffer); - -char* g_lpstrFileName = NULL; -char* g_lpstrCharSet = NULL; -char* g_lpstrInputFile = NULL; -int g_outputPoints = 0; - -static const char* errorDLLRead = "Unable to read Windows DLL.\n"; -static const char* errorFNTRead = "Unable to read .FNT file.\n"; -static const char* errorOpenFile = "Unable to open file.\n"; -static const char* errorMemory = "Memory allocation error.\n"; -static const char* errorFile = "Corrupt or invalid file.\n"; -static const char* errorFontData = "Unable to parse font data: Error "; -static const char* errorEmpty = "No fonts found.\n"; +static int dump_bdf( fnt_fontS* cpe_font_struct, unsigned char* file_buffer); +static int dump_bdf_hdr(FILE* fs, fnt_fontS* cpe_font_struct, unsigned char* file_buffer); + +static char* g_lpstrFileName = NULL; +static char* g_lpstrCharSet = NULL; +static char* g_lpstrInputFile = NULL; +static int g_outputPoints = 0; /* info */ @@ -202,7 +194,7 @@ static int parse_fnt_data(unsigned char* file_buffer, int length) return t; } -int dump_bdf( fnt_fontS* cpe_font_struct, unsigned char* file_buffer) +static int dump_bdf( fnt_fontS* cpe_font_struct, unsigned char* file_buffer) { FILE* fp; int ic; @@ -311,7 +303,7 @@ return 0; } -int dump_bdf_hdr(FILE* fs, fnt_fontS* cpe_font_struct, unsigned char* file_buffer) +static int dump_bdf_hdr(FILE* fs, fnt_fontS* cpe_font_struct, unsigned char* file_buffer) { int l_fchar = return_data_value(dfChar, &cpe_font_struct->hdr.fi.dfFirstChar), l_lchar = return_data_value(dfChar, &cpe_font_struct->hdr.fi.dfLastChar); @@ -595,20 +587,20 @@ int main(int argc, char **argv) if( !(lpfont = (unsigned char*) realloc( lpfont, length )) ) { - fprintf(stderr, errorMemory ); + fprintf(stderr, "Memory allocation error.\n" ); exit(1); } lseek( fd, offset, SEEK_SET ); if( read(fd, lpfont, length) != length ) { - fprintf(stderr, errorDLLRead ); + fprintf(stderr, "Unable to read Windows DLL.\n" ); exit(1); } if( (i = parse_fnt_data( lpfont, length )) ) { - fprintf(stderr, "%s%d\n", errorFontData, i ); + fprintf(stderr, "Unable to parse font data: Error %d\n", i ); exit(1); } } @@ -617,14 +609,14 @@ int main(int argc, char **argv) } else { - fprintf(stderr, errorEmpty ); + fprintf(stderr, "No fonts found.\n" ); exit(1); } free( lpdata ); } else { - fprintf(stderr, errorDLLRead); + fprintf(stderr, "Unable to read Windows DLL.\n" ); exit(1); } break; @@ -634,20 +626,20 @@ int main(int argc, char **argv) { if( (i = parse_fnt_data( lpdata, file_stat.st_size )) ) { - fprintf(stderr, "%s%d\n", errorFontData, i ); + fprintf(stderr, "Unable to parse font data: Error %d\n", i ); exit(1); } free( lpdata ); } else { - fprintf(stderr, errorFNTRead); + fprintf(stderr, "Unable to read .FNT file.\n" ); exit(1); } break; case FILE_ERROR: - fprintf(stderr, errorFile ); + fprintf(stderr, "Corrupt or invalid file.\n" ); exit(1); } close(fd); @@ -655,7 +647,7 @@ int main(int argc, char **argv) } else { - fprintf(stderr, errorOpenFile ); + fprintf(stderr, "Unable to open '%s'.\n", g_lpstrInputFile ); exit(1); } }

1 0

Vincent Povirk : server: Fix string format warning.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 8b49ecc3d84cc7fe7b9633f5b2eb37e9a8562720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b49ecc3d84cc7fe7b9633f5b… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Dec 4 22:02:35 2008 -0600 server: Fix string format warning. --- server/trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/trace.c b/server/trace.c index dfbddac..edb5440 100644 --- a/server/trace.c +++ b/server/trace.c @@ -67,7 +67,7 @@ static void dump_uints( const int *ptr, int len ) static void dump_timeout( const timeout_t *time ) { - fprintf( stderr, get_timeout_str(*time) ); + fputs( get_timeout_str(*time), stderr ); } static void dump_file_pos( const file_pos_t *pos )

1 0

Vincent Povirk : widl: Fix string format warning.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 479f5a1b217a9293528924e3f61498f6757467d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479f5a1b217a9293528924e3f… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Dec 4 23:25:56 2008 -0600 widl: Fix string format warning. yyerror takes a single string argument, not a format string. --- tools/widl/utils.c | 18 ++++++------------ tools/widl/utils.h | 2 +- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 1730e41..2e05add 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -66,18 +66,6 @@ static void generic_msg(const loc_info_t *loc_info, const char *s, const char *t } -/* yyerror: yacc assumes this is not newline terminated. */ -void parser_error(const char *s, ...) -{ - loc_info_t cur_location = CURRENT_LOCATION; - va_list ap; - va_start(ap, s); - generic_msg(&cur_location, s, "Error", ap); - fprintf(stderr, "\n"); - va_end(ap); - exit(1); -} - void error_loc(const char *s, ...) { loc_info_t cur_loc = CURRENT_LOCATION; @@ -88,6 +76,12 @@ void error_loc(const char *s, ...) exit(1); } +/* yyerror: yacc assumes this is not newline terminated. */ +void parser_error(const char *s) +{ + error_loc("%s\n", s); +} + void error_loc_info(const loc_info_t *loc_info, const char *s, ...) { va_list ap; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 761d3b4..5c440be 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -33,7 +33,7 @@ char *xstrdup(const char *str); #define __attribute__(X) #endif -void parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); +void parser_error(const char *s) __attribute__((noreturn)); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); void error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn));

1 0