April 2010 - Wine-commits - list.winehq.org

Gerald Pfeifer : winmm: Remove variables duration and samples which are not really used from check_position .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: d623f0045ab0e51456991394f7fee4c70d508234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d623f0045ab0e51456991394f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 23:04:20 2010 +0200 winmm: Remove variables duration and samples which are not really used from check_position. --- dlls/winmm/tests/capture.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index c46d35a..81d6281 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -54,14 +54,9 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, LPWAVEFORMATEX pwfx ) { MMTIME mmtime; - DWORD samples; - double duration; MMRESULT rc; DWORD returned; - samples=bytes/(pwfx->wBitsPerSample/8*pwfx->nChannels); - duration=((double)samples)/pwfx->nSamplesPerSec; - mmtime.wType = TIME_BYTES; rc=waveInGetPosition(win, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR,

1 0

Gerald Pfeifer : winecfg: Remove variable cUnixPathLen which is not really used from apply_shell_folder_changes .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 814f570e5b9aeb3051c40bf276f122d6af02f02c URL: http://source.winehq.org/git/wine.git/?a=commit;h=814f570e5b9aeb3051c40bf27… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 23:07:37 2010 +0200 winecfg: Remove variable cUnixPathLen which is not really used from apply_shell_folder_changes. --- programs/winecfg/theme.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 96110b3..56b3585 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -903,7 +903,7 @@ static void on_shell_folder_edit_changed(HWND hDlg) { static void apply_shell_folder_changes(void) { WCHAR wszPath[MAX_PATH]; char szBackupPath[FILENAME_MAX], szUnixPath[FILENAME_MAX], *pszUnixPath = NULL; - int i, cUnixPathLen; + int i; struct stat statPath; HRESULT hr; @@ -923,7 +923,6 @@ static void apply_shell_folder_changes(void) { HeapFree(GetProcessHeap(), 0, pszUnixPath); /* Derive name for folder backup. */ - cUnixPathLen = lstrlenA(szUnixPath); lstrcpyA(szBackupPath, szUnixPath); lstrcatA(szBackupPath, ".winecfg");

1 0

Frédéric Delanoy : tools: Fix formatting errors in winemaker manpage.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: f99fc3831317be1ed981a5f0a670c0ee4ddaca4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99fc3831317be1ed981a5f0a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 25 01:55:43 2010 +0200 tools: Fix formatting errors in winemaker manpage. --- tools/winemaker.de.man.in | 72 ++++++++++++++++++++++---------------------- tools/winemaker.man.in | 72 ++++++++++++++++++++++---------------------- 2 files changed, 72 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f99fc3831317be1ed981a…

1 0

Alexandre Julliard : wined3d: Avoid a compiler warning on old gcc.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: fdfabd53f166be67c0ae947fd5dadaf59b939642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfabd53f166be67c0ae947fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 07:18:18 2010 -0500 wined3d: Avoid a compiler warning on old gcc. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index db7ccd2..7648d15 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -255,7 +255,7 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA /* GL locking is done by the caller. */ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_info, GLhandleARB program) { - GLint i, object_count, source_size; + GLint i, object_count, source_size = -1; GLhandleARB *objects; char *source = NULL; @@ -275,7 +275,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGetObjectParameterivARB(objects[i], GL_OBJECT_SHADER_SOURCE_LENGTH_ARB, &tmp)); - if (!source || source_size < tmp) + if (source_size < tmp) { HeapFree(GetProcessHeap(), 0, source);

1 0

Alexandre Julliard : ntdll: Make TAPE_GetStatus inline to avoid a unused function warning.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 2e823590d4431dfcbea95d46c62193a2c6a21031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e823590d4431dfcbea95d46c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 07:18:46 2010 -0500 ntdll: Make TAPE_GetStatus inline to avoid a unused function warning. --- dlls/ntdll/tape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index b8a4ab2..2667e18 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -88,7 +88,7 @@ static const char *io2str( DWORD io ) /****************************************************************** * TAPE_GetStatus */ -static NTSTATUS TAPE_GetStatus( int error ) +static inline NTSTATUS TAPE_GetStatus( int error ) { if (!error) return STATUS_SUCCESS; return FILE_GetNtStatus();

1 0

Gerald Pfeifer : ole32: Remove variable res which is not really used from CompositeMonikerImpl_Reduce .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 1e3aba6e7c3207ac5e9d73ddddbde25f5d3d2994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3aba6e7c3207ac5e9d73ddd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 14:11:58 2010 +0200 ole32: Remove variable res which is not really used from CompositeMonikerImpl_Reduce. --- dlls/ole32/compositemoniker.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 7402b8e..275d875 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -445,7 +445,6 @@ static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - HRESULT res; IMoniker *tempMk,*antiMk,*mostRigthMk,*leftReducedComposedMk,*mostRigthReducedMk; IEnumMoniker *enumMoniker; @@ -462,8 +461,8 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); IEnumMoniker_Release(enumMoniker); - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); + CreateAntiMoniker(&antiMk); + IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); return IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); @@ -479,8 +478,8 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); IEnumMoniker_Release(enumMoniker); - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); + CreateAntiMoniker(&antiMk); + IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); /* If any of the components reduces itself, the method returns S_OK and passes back a composite */

1 0

Gerald Pfeifer : d3d9: Remove variable hr which is not really used from resource_test_cleanup.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: f2d7cbc90c7104743b4bd0d71a451e99545d90b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d7cbc90c7104743b4bd0d71… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Apr 23 20:59:35 2010 +0200 d3d9: Remove variable hr which is not really used from resource_test_cleanup. --- dlls/d3d9/tests/stateblock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 4e8907a..8b7a0ba 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -2027,7 +2027,6 @@ static void resource_test_cleanup(IDirect3DDevice9 *device, struct state_test *t struct resource_test_context *ctx = test->test_context; const struct resource_test_arg *arg = test->test_arg; unsigned int i; - HRESULT hr; resource_apply_data(device, test, &ctx->default_data); @@ -2042,7 +2041,7 @@ static void resource_test_cleanup(IDirect3DDevice9 *device, struct state_test *t for (i = 0; i < arg->tex_count; ++i) { - hr = IDirect3DBaseTexture9_Release(ctx->test_data_all.tex[i]); + IDirect3DBaseTexture9_Release(ctx->test_data_all.tex[i]); } HeapFree(GetProcessHeap(), 0, ctx->default_data.vb);

1 0

Gerald Pfeifer : wpp: Remove variable dbgtext which is not really used frommake_number.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: b52eef95118dfcb23c3b435672f93eea5234075c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52eef95118dfcb23c3b43567… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 12:13:33 2010 +0200 wpp: Remove variable dbgtext which is not really used frommake_number. --- libs/wpp/ppl.l | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 06a4f18..6e0c7a1 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -961,7 +961,6 @@ static int make_number(int radix, YYSTYPE *val, const char *str, int len) */ static void expand_special(pp_entry_t *ppp) { - const char *dbgtext = "?"; static char *buf = NULL; char *new_buf; @@ -969,7 +968,6 @@ static void expand_special(pp_entry_t *ppp) if(!strcmp(ppp->ident, "__LINE__")) { - dbgtext = "def_special(__LINE__)"; new_buf = pp_xrealloc(buf, 32); if(!new_buf) return; @@ -978,7 +976,6 @@ static void expand_special(pp_entry_t *ppp) } else if(!strcmp(ppp->ident, "__FILE__")) { - dbgtext = "def_special(__FILE__)"; new_buf = pp_xrealloc(buf, strlen(pp_status.input) + 3); if(!new_buf) return;

1 0

Gerald Pfeifer : winedump: Remove variable strtable which is not really used from dump_symbol_table.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 4e7fe5823ac3cb3dba1579da0570134905ba44da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7fe5823ac3cb3dba1579da0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 12:43:48 2010 +0200 winedump: Remove variable strtable which is not really used from dump_symbol_table. --- tools/winedump/pe.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 7275b2c..c06db31 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1420,7 +1420,6 @@ static void dump_symbol_table(void) { const IMAGE_SYMBOL* sym; int numsym; - const char* strtable; numsym = PE_nt_headers->FileHeader.NumberOfSymbols; if (!PE_nt_headers->FileHeader.PointerToSymbolTable || !numsym) @@ -1428,8 +1427,6 @@ static void dump_symbol_table(void) sym = PRD(PE_nt_headers->FileHeader.PointerToSymbolTable, sizeof(*sym) * numsym); if (!sym) return; - /* FIXME: no way to get strtable size */ - strtable = (const char*)&sym[numsym]; dump_coff_symbol_table(sym, numsym, IMAGE_FIRST_SECTION(PE_nt_headers)); }

1 0

Gerald Pfeifer : winmm: Remove variable devID which is not really used from MMDRV_Message.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 2af5528a0c6860f95c29be0d7339a452556acfc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af5528a0c6860f95c29be0d7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 14:07:05 2010 +0200 winmm: Remove variable devID which is not really used from MMDRV_Message. --- dlls/winmm/lolvldrv.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 0d10998..193310f 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -93,7 +93,6 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD ret; WINE_MM_DRIVER_PART* part; WINE_LLTYPE* llType = &llTypes[mld->type]; - int devID; TRACE("(%s %u %u 0x%08lx 0x%08lx 0x%08lx)\n", llTypes[mld->type].typestr, mld->uDeviceID, wMsg, @@ -105,13 +104,11 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, llTypes[mld->type].typestr); return MMSYSERR_BADDEVICEID; } - devID = -1; } else { if (mld->uDeviceID >= llType->wMaxId) { WARN("uDev(%u) requested >= max (%d)\n", mld->uDeviceID, llType->wMaxId); return MMSYSERR_BADDEVICEID; } - devID = mld->uDeviceID; } lpDrv = &MMDrvs[mld->mmdIndex];

1 0