wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Marcus Meissner : krnl386.exe16: pSeg might be NULL (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 5574b64ede474cd63915a6b7708086446a4355b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5574b64ede474cd63915a6b77… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:16:02 2011 +0200 krnl386.exe16: pSeg might be NULL (Coverity). --- dlls/krnl386.exe16/dosmem.c | 2 +- dlls/krnl386.exe16/global.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index 1f1815b..3a06d8a 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -480,7 +480,7 @@ LPVOID DOSMEM_AllocBlock(UINT size, UINT16* pseg) curr = DOSMEM_root_block; if (!(psp = DOSVM_psp)) psp = MCB_PSP_DOS; - *pseg = 0; + if (pseg) *pseg = 0; TRACE( "(%04xh)\n", size ); diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index 7f3807e..d9dcb1b 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -362,7 +362,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16( newptr = 0; else { - newptr = DOSMEM_AllocBlock( size, 0 ); + newptr = DOSMEM_AllocBlock( size, NULL ); if (newptr) { memcpy( newptr, ptr, oldsize );

1 0

Marcus Meissner : d3d9: Remove superflous NULL checks (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 8e5c79e439420c09973c923fd93661eb1ec073a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5c79e439420c09973c923fd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:12:42 2011 +0200 d3d9: Remove superflous NULL checks (Coverity). --- dlls/d3d9/tests/visual.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 98a658b..5328447 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11618,11 +11618,8 @@ static void clip_planes_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); IDirect3DSurface9_Release(original_rt); - if (offscreen) - { - IDirect3DSurface9_Release(offscreen_surface); - IDirect3DTexture9_Release(offscreen); - } + IDirect3DSurface9_Release(offscreen_surface); + IDirect3DTexture9_Release(offscreen); } static void fp_special_test(IDirect3DDevice9 *device)

1 0

Marcus Meissner : ddrawex: Remove superflous NULL checks, add error skips ( Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: a6b714d082cd165f41f6a693a14bd3438bb41d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b714d082cd165f41f6a693a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:08:36 2011 +0200 ddrawex: Remove superflous NULL checks, add error skips (Coverity). --- dlls/ddrawex/tests/surface.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index fb3def9..4dcae02 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -422,8 +422,17 @@ START_TEST(surface) hr = pDllGetClassObject(&CLSID_DirectDrawFactory, &IID_IClassFactory, (void **) &classfactory); ok(hr == S_OK, "Failed to create a IClassFactory\n"); + if (!SUCCEEDED(hr)) { + skip("Failed to get DirectDrawFactory\n"); + return; + } hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IDirectDrawFactory, (void **) &factory); ok(hr == S_OK, "Failed to create a IDirectDrawFactory\n"); + if (!SUCCEEDED(hr)) { + IClassFactory_Release(classfactory); + skip("Failed to get a DirectDrawFactory\n"); + return; + } GetDCTest(); CapsTest(); @@ -431,12 +440,8 @@ START_TEST(surface) test_surface_from_dc3(); test_surface_from_dc4(); - if(factory) { - ref = IDirectDrawFactory_Release(factory); - ok(ref == 0, "IDirectDrawFactory not cleanly released\n"); - } - if(classfactory) { - ref = IClassFactory_Release(classfactory); - todo_wine ok(ref == 1, "IClassFactory refcount wrong, ref = %u\n", ref); - } + ref = IDirectDrawFactory_Release(factory); + ok(ref == 0, "IDirectDrawFactory not cleanly released\n"); + ref = IClassFactory_Release(classfactory); + todo_wine ok(ref == 1, "IClassFactory refcount wrong, ref = %u\n", ref); }

1 0

Marcus Meissner : dmstyle: Reverse NULL check and deref (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: e4d63f77114466ca808bbec3eba3821dd940b23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d63f77114466ca808bbec3e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:57:51 2011 +0200 dmstyle: Reverse NULL check and deref (Coverity). --- dlls/dmstyle/style.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index eb6e77c..547025e 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -730,11 +730,11 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST TRACE_(dmfile)(": Pattern chunk\n"); /** alloc new motif entry */ pNewMotif = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_MOTIF)); - list_add_tail (&This->Motifs, &pNewMotif->entry); if (NULL == pNewMotif) { ERR(": no more memory\n"); return E_OUTOFMEMORY; } + list_add_tail (&This->Motifs, &pNewMotif->entry); IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL); /** TODO trace pattern */

1 0

Marcus Meissner : gameux: Revert NULL ptr check and deref (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 4e4aeeadafce90336a6f8d6208d2f62ec852e39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4aeeadafce90336a6f8d620… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:54:14 2011 +0200 gameux: Revert NULL ptr check and deref (Coverity). --- dlls/gameux/gamestatistics.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 65aa0f7..70d909e 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -819,12 +819,13 @@ static HRESULT WINAPI GameStatisticsImpl_GetCategoryTitle( TRACE("%p, %d, %p\n", This, categoryIndex, pTitle); + if(!pTitle) + return E_INVALIDARG; *pTitle = NULL; - if(!pTitle || categoryIndex >= MAX_CATEGORIES) + if (categoryIndex >= MAX_CATEGORIES) hr = E_INVALIDARG; - if(SUCCEEDED(hr)) { nLength = lstrlenW(This->stats.categories[categoryIndex].sName);

1 0

Marcus Meissner : ole32: Access the array entry, not the array (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 2395ea98bb61dcd3a468f615e7d5c8aa5d45be4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2395ea98bb61dcd3a468f615e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:43:02 2011 +0200 ole32: Access the array entry, not the array (Coverity). --- dlls/ole32/stg_prop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index cc29c0e..5eb0371 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -720,8 +720,8 @@ static HRESULT WINAPI IPropertyStorage_fnReadPropertyNames( hr = S_OK; rglpwstrName[i] = CoTaskMemAlloc((len + 1) * sizeof(WCHAR)); - if (rglpwstrName) - memcpy(rglpwstrName, name, (len + 1) * sizeof(WCHAR)); + if (rglpwstrName[i]) + memcpy(rglpwstrName[i], name, (len + 1) * sizeof(WCHAR)); else hr = STG_E_INSUFFICIENTMEMORY; }

1 0

Marcus Meissner : quartz: Removed useless NULL check (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 3f426090429e1a18e763a62a330468956c8c3abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f426090429e1a18e763a62a3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:36:03 2011 +0200 quartz: Removed useless NULL check (Coverity). --- dlls/quartz/acmwrapper.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 7cdaba6..814bf84 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -230,8 +230,7 @@ error: ash.pbSrc += ash.cbSrcLengthUsed; ash.cbSrcLength -= ash.cbSrcLengthUsed; - if (pOutSample) - IMediaSample_Release(pOutSample); + IMediaSample_Release(pOutSample); pOutSample = NULL; }

1 0

Marcus Meissner : strmbase: Move NULL check up a bit (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 67ae245a774a60023c6160db242c19f998310ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ae245a774a60023c6160db2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:32:39 2011 +0200 strmbase: Move NULL check up a bit (Coverity). --- dlls/strmbase/transform.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index cfde074..791d27e 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -222,11 +222,12 @@ HRESULT TransformFilter_Construct(const IBaseFilterVtbl *pVtbl, LONG filter_size assert(filter_size >= sizeof(TransformFilter)); pTf = CoTaskMemAlloc(filter_size); - ZeroMemory(pTf, filter_size); if (!pTf) return E_OUTOFMEMORY; + ZeroMemory(pTf, filter_size); + if (SUCCEEDED(TransformFilter_Init(pVtbl, pClsid, pFuncsTable, pTf))) { *ppTransformFilter = (IBaseFilter*)(&pTf->filter.lpVtbl);

1 0

Marcus Meissner : shell32: Remove superflous NULL check (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 8279e753b82d022cefd21831bf5e99fcad05900c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8279e753b82d022cefd21831b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:30:55 2011 +0200 shell32: Remove superflous NULL check (Coverity). --- dlls/shell32/tests/brsfolder.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index b7f920d..c3e9d3c 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -149,7 +149,7 @@ static int CALLBACK create_new_folder_callback(HWND hwnd, UINT uMsg, */ static void test_click_make_new_folder_button(void) { - HRESULT resCoInit; + HRESULT resCoInit, hr; BROWSEINFO bi; LPITEMIDLIST pidl = NULL; LPITEMIDLIST test_folder_pidl; @@ -202,7 +202,12 @@ static void test_click_make_new_folder_button(void) /* Use test folder as the root folder for dialog box */ MultiByteToWideChar(CP_UTF8, 0, test_folder_path, MAX_PATH, test_folder_pathW, MAX_PATH); - SHGetDesktopFolder(&test_folder_object); + hr = SHGetDesktopFolder(&test_folder_object); + ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); + if (!SUCCEEDED(hr)) { + skip("SHGetDesktopFolder failed - skipping\n"); + return; + } test_folder_object->lpVtbl->ParseDisplayName(test_folder_object, NULL, NULL, test_folder_pathW, 0UL, &test_folder_pidl, 0UL); bi.pidlRoot = test_folder_pidl; @@ -243,8 +248,7 @@ static void test_click_make_new_folder_button(void) CoTaskMemFree(pidl); if (test_folder_pidl) CoTaskMemFree(test_folder_pidl); - if (test_folder_object) - test_folder_object->lpVtbl->Release(test_folder_object); + test_folder_object->lpVtbl->Release(test_folder_object); CoUninitialize(); } @@ -300,7 +304,7 @@ static int CALLBACK selection_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPAR static void test_selection(void) { - HRESULT resCoInit; + HRESULT resCoInit, hr; BROWSEINFO bi; LPITEMIDLIST pidl = NULL; IShellFolder *desktop_object; @@ -325,7 +329,12 @@ static void test_selection(void) bi.lpszTitle = (LPTSTR) title; bi.lpfn = selection_callback; - SHGetDesktopFolder(&desktop_object); + hr = SHGetDesktopFolder(&desktop_object); + ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); + if (!SUCCEEDED(hr)) { + skip("SHGetDesktopFolder failed - skipping\n"); + return; + } desktop_object->lpVtbl->ParseDisplayName(desktop_object, NULL, NULL, selected_folderW, 0UL, &selected_folder_pidl, 0UL); bi.pidlRoot = selected_folder_pidl; @@ -344,6 +353,8 @@ static void test_selection(void) if (pidl) CoTaskMemFree(pidl); + desktop_object->lpVtbl->Release(desktop_object); + CoUninitialize(); }

1 0

Marcus Meissner : oleaut32: Unshadow cmp to make code work (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 5b80d1beeaa3c592680caab444fda7a0f2e1c741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b80d1beeaa3c592680caab44… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 22:14:21 2011 +0200 oleaut32: Unshadow cmp to make code work (Coverity). --- dlls/oleaut32/vartype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2b1307e..3dd65d8 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4562,6 +4562,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI /* Our decimals now have the same scale, we can add them as 96 bit integers */ ULONG overflow = 0; BYTE sign = DECIMAL_POS; + int cmp; /* Correct for the sign of the result */ if (DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight)) @@ -4572,7 +4573,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI } else if (DEC_SIGN(pDecLeft) && !DEC_SIGN(pDecRight)) { - int cmp = VARIANT_DecCmp(pDecLeft, pDecRight); + cmp = VARIANT_DecCmp(pDecLeft, pDecRight); /* -x + y : Negative if x > y */ if (cmp > 0) @@ -4593,7 +4594,7 @@ VarDecAdd_AsInvertedNegative: } else if (!DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight)) { - int cmp = VARIANT_DecCmp(pDecLeft, pDecRight); + cmp = VARIANT_DecCmp(pDecLeft, pDecRight); /* x + -y : Negative if x <= y */ if (cmp <= 0)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
81
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 June 2011