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

Gerald Pfeifer : ole32: Remove variable res which is not really used from CompositeMonikerImpl_Reduce .
by Alexandre Julliard April 26, 2010

April 26, 2010

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 : winecfg: Remove variable cUnixPathLen which is not really used from apply_shell_folder_changes .
by Alexandre Julliard April 26, 2010

April 26, 2010

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

Gerald Pfeifer : d3dx9_36: Remove variable nul which is not really used from D3DXVector4Test.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: d30629ff74fd2c7ab28b2b32f5e81ee495073916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30629ff74fd2c7ab28b2b32f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 16:30:50 2010 +0200 d3dx9_36: Remove variable nul which is not really used from D3DXVector4Test. --- dlls/d3dx9_36/tests/math.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9cc9248..832798f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1308,13 +1308,12 @@ static void D3DXVector3Test(void) static void D3DXVector4Test(void) { - D3DXVECTOR4 expectedvec, gotvec, nul, u, v, w, x; + D3DXVECTOR4 expectedvec, gotvec, u, v, w, x; LPD3DXVECTOR4 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat; FLOAT coeff1, coeff2, expected, got, scale; - nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; w.x = 4.0f; w.y =6.0f; w.z = -2.0f; w.w = 1.0f;

1 0

Frédéric Delanoy : tools: Fix formatting errors in winemaker manpage.
by Alexandre Julliard April 26, 2010

April 26, 2010

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 April 26, 2010

April 26, 2010

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

Gerald Pfeifer : msvidc32: Remove variable bit_per_pixel which is not really used from CRAM_Decompress and CRAM_DecompressEx .
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: ba9b207274870b4abbbe45ccb1556f3918f32c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9b207274870b4abbbe45ccb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 22:48:17 2010 +0200 msvidc32: Remove variable bit_per_pixel which is not really used from CRAM_Decompress and CRAM_DecompressEx. --- dlls/msvidc32/msvideo1.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 68a52c6..71ed2d7 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -385,7 +385,6 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD size ) { LONG width, height, stride, sz; - WORD bit_per_pixel; TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); @@ -396,7 +395,6 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; - bit_per_pixel = icd->lpbiInput->biBitCount; stride = width; /* in bytes or 16bit words */ sz = icd->lpbiInput->biSizeImage; @@ -417,7 +415,6 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DWORD size ) { LONG width, height, stride, sz; - WORD bit_per_pixel; TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); @@ -428,7 +425,6 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; - bit_per_pixel = icd->lpbiSrc->biBitCount; stride = width; sz = icd->lpbiSrc->biSizeImage;

1 0

Gerald Pfeifer : winedump: Remove variable strtable which is not really used from dump_symbol_table.
by Alexandre Julliard April 26, 2010

April 26, 2010

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 April 26, 2010

April 26, 2010

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

Gerald Pfeifer : d3drm: Remove two variables which are not really used from IDirect3DRMMeshBuilderImpl_Load .
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 40b1b8fa7eca7d8ec35624c45ce588c3d717d354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b1b8fa7eca7d8ec35624c45… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 15:59:49 2010 +0200 d3drm: Remove two variables which are not really used from IDirect3DRMMeshBuilderImpl_Load. --- dlls/d3drm/meshbuilder.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 6eb5d1b..a2013f4 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -459,10 +459,6 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if if (loadflags == D3DRMLOAD_FROMMEMORY) { - DXFILELOADMEMORY info; - LPD3DRMLOADMEMORY pinfo = (LPD3DRMLOADMEMORY)filename; - info.lpMemory = pinfo->lpMemory; - info.dSize = pinfo->dSize; load_options = DXFILELOAD_FROMMEMORY; } else

1 0

Gerald Pfeifer : winex11: Remove variable datasize which is not really used from X11DRV_CLIPBOARD_ExportTextHtml .
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: ad714303287eee97022d33c6688db42167ade952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad714303287eee97022d33c66… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 16:28:13 2010 +0200 winex11: Remove variable datasize which is not really used from X11DRV_CLIPBOARD_ExportTextHtml. --- dlls/winex11.drv/clipboard.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4d4306e..f674b2e 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1809,7 +1809,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportTextHtml(Display *display, Window requestor Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { HANDLE hdata; - UINT datasize; LPCSTR data, field_value; UINT fragmentstart, fragmentend, htmlsize; HANDLE hhtmldata=NULL; @@ -1825,8 +1824,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportTextHtml(Display *display, Window requestor hdata = lpdata->hData; - datasize = GlobalSize(hdata); - data = GlobalLock(hdata); if (!data) {

1 0