wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

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 : advapi32: Remove variable ret which is not really used from LsaLookupNames2.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 0351f56e67c6137a4103bd382dbd27e3450d3144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0351f56e67c6137a4103bd382… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 22:53:35 2010 +0200 advapi32: Remove variable ret which is not really used from LsaLookupNames2. --- dlls/advapi32/lsa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index b5dab21..50877cc 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -355,7 +355,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, { ULONG i, sid_size_total = 0, domain_size_max = 0, size; ULONG sid_size, domain_size, mapped; - BOOL ret, handled = FALSE; + BOOL handled = FALSE; SID_NAME_USE use; SID *sid; @@ -366,7 +366,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, { handled = FALSE; sid_size = domain_size = 0; - ret = lookup_name( &names[i], NULL, &sid_size, NULL, &domain_size, &use, &handled ); + lookup_name( &names[i], NULL, &sid_size, NULL, &domain_size, &use, &handled ); if (handled) { sid_size_total += sid_size; @@ -408,7 +408,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, handled = FALSE; sid_size = sid_size_total; domain_size = domain_size_max; - ret = lookup_name( &names[i], sid, &sid_size, domain.Buffer, &domain_size, &use, &handled ); + lookup_name( &names[i], sid, &sid_size, domain.Buffer, &domain_size, &use, &handled ); if (handled) { (*sids)[i].Sid = sid;

1 0

Gerald Pfeifer : quartz: Fix return value for StdMediaSample2_GetTime in error cases.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 6c016ac039dd325c4335f454762899a8f3f829ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c016ac039dd325c4335f4547… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 23:00:54 2010 +0200 quartz: Fix return value for StdMediaSample2_GetTime in error cases. --- dlls/quartz/memallocator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 7f799c9..16b94e3 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -534,7 +534,7 @@ static HRESULT WINAPI StdMediaSample2_GetTime(IMediaSample2 * iface, REFERENCE_T hr = S_OK; } - return S_OK; + return hr; } static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 * iface, REFERENCE_TIME * pStart, REFERENCE_TIME * pEnd)

1 0

Gerald Pfeifer : msvidc32: Remove variable bit_per_pixel which is not really used from CRAM_Decompress and CRAM_DecompressEx .
by Alexandre Julliard 26 Apr '10

26 Apr '10

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 : gdi32: Remove variable retb which is not really used from test_closefigure.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 6cad49da4bfe0da243b9478b8a84b443bf02db45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cad49da4bfe0da243b9478b8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 16:46:48 2010 +0200 gdi32: Remove variable retb which is not really used from test_closefigure. --- dlls/gdi32/tests/path.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 66cd039..43f3d62 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -393,7 +393,6 @@ done: } static void test_closefigure(void) { - BOOL retb; int nSize, nSizeWitness; HDC hdc = GetDC(0); @@ -402,7 +401,7 @@ static void test_closefigure(void) { LineTo(hdc, 95, 0); LineTo(hdc, 0, 95); - retb = CloseFigure(hdc); + CloseFigure(hdc); EndPath(hdc); nSize = GetPath(hdc, NULL, NULL, 0);

1 0

Gerald Pfeifer : d3dx9_36: Remove variable nul which is not really used from D3DXVector4Test.
by Alexandre Julliard 26 Apr '10

26 Apr '10

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

Gerald Pfeifer : winex11: Remove variable size which is not really used from X11DRV_CLIPBOARD_SerializeMetafile .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: f6a79921aea88d548851dd16376b0f40aac7bdc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a79921aea88d548851dd163… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 14:05:19 2010 +0200 winex11: Remove variable size which is not really used from X11DRV_CLIPBOARD_SerializeMetafile. --- dlls/winex11.drv/clipboard.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f674b2e..584136a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2411,14 +2411,13 @@ static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDW h = GlobalAlloc(0, sizeof(METAFILEPICT)); if (h) { - unsigned int wiresize, size; + unsigned int wiresize; LPMETAFILEPICT lpmfp = GlobalLock(h); memcpy(lpmfp, hdata, sizeof(METAFILEPICT)); wiresize = *lpcbytes - sizeof(METAFILEPICT); lpmfp->hMF = SetMetaFileBitsEx(wiresize, ((const BYTE *)hdata) + sizeof(METAFILEPICT)); - size = GetMetaFileBitsEx(lpmfp->hMF, 0, NULL); GlobalUnlock(h); } }

1 0

Gerald Pfeifer : winex11: Remove variable datasize which is not really used from X11DRV_CLIPBOARD_ExportTextHtml .
by Alexandre Julliard 26 Apr '10

26 Apr '10

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

Gerald Pfeifer : d3drm: Remove two variables which are not really used from IDirect3DRMMeshBuilderImpl_Load .
by Alexandre Julliard 26 Apr '10

26 Apr '10

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 : rpcrt4: Remove variable size which is not really used from NdrComplexArrayUnmarshall .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 3b3085fba1deec467b15a66ba8fa31a17bd6a345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3085fba1deec467b15a66ba… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 15:55:22 2010 +0200 rpcrt4: Remove variable size which is not really used from NdrComplexArrayUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 283cac9..3ad55aa 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4187,7 +4187,6 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - ULONG size; unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; int saved_ignore_embedded; @@ -4209,7 +4208,6 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->IgnoreEmbeddedPointers = 1; pStubMsg->MemorySize = 0; NdrComplexArrayMemorySize(pStubMsg, pFormat); - size = pStubMsg->MemorySize; pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - saved_buffer));

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010