wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Marcus Meissner : wrc: Free type to avoid leaks (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: fc3b99b90a91f97d706eda08db4931ddc4c31522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3b99b90a91f97d706eda08d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 22:14:57 2009 +0100 wrc: Free type to avoid leaks (Coverity). --- tools/wrc/readres.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wrc/readres.c b/tools/wrc/readres.c index e3a4db7..f7aaba8 100644 --- a/tools/wrc/readres.c +++ b/tools/wrc/readres.c @@ -292,7 +292,10 @@ static resource_t *read_res32(FILE *fp) usrres = new_user(type, NULL, new_int(memopt)); } else + { + free (type); usrres = NULL; + } rsc = new_resource(res_type, usrres, memopt,

1 0

Marcus Meissner : msacm32: Add missing HeapALloc failure checks (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: f0b685d5045e12ba670ee69fcf032e2fec60b42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b685d5045e12ba670ee69fc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 21:53:36 2009 +0100 msacm32: Add missing HeapALloc failure checks (Coverity). --- dlls/msacm32/internal.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index cf76a57..4100aae 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -289,18 +289,29 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileNa debugstr_w(pszDriverAlias), debugstr_w(pszFileName), pLocalDriver); padid = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMDRIVERID)); + if (!padid) + return NULL; padid->obj.dwType = WINE_ACMOBJ_DRIVERID; padid->obj.pACMDriverID = padid; padid->pszDriverAlias = NULL; if (pszDriverAlias) { padid->pszDriverAlias = HeapAlloc( MSACM_hHeap, 0, (strlenW(pszDriverAlias)+1) * sizeof(WCHAR) ); + if (!padid->pszDriverAlias) { + HeapFree(MSACM_hHeap, 0, padid); + return NULL; + } strcpyW( padid->pszDriverAlias, pszDriverAlias ); } padid->pszFileName = NULL; if (pszFileName) { padid->pszFileName = HeapAlloc( MSACM_hHeap, 0, (strlenW(pszFileName)+1) * sizeof(WCHAR) ); + if (!padid->pszFileName) { + HeapFree(MSACM_hHeap, 0, padid->pszDriverAlias); + HeapFree(MSACM_hHeap, 0, padid); + return NULL; + } strcpyW( padid->pszFileName, pszFileName ); } padid->pLocalDriver = pLocalDriver;

1 0

Marcus Meissner : winedbg: Check for buffer being NULL.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 102a3b9892cc4253aee595c915673cf537d15cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102a3b9892cc4253aee595c91… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 19:53:19 2009 +0100 winedbg: Check for buffer being NULL. --- programs/winedbg/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index c4b09a3..03efac1 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -102,7 +102,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG base, */ if (!types_get_info(&type, TI_GET_VALUE, &v) || (v.n1.n2.vt & VT_BYREF)) { - snprintf(buffer, sz, "Couldn't dereference pointer for const value"); + if (buffer) snprintf(buffer, sz, "Couldn't dereference pointer for const value"); return FALSE; } pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw));

1 0

Marcus Meissner : oleaut32: Removed useless NULL ptr check (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 4d8fffb24ba65787d001208f4d19afb1b3a30642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8fffb24ba65787d001208f4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 13:15:32 2009 +0100 oleaut32: Removed useless NULL ptr check (Coverity). --- dlls/oleaut32/typelib.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 503aaf7..d3168ec 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3952,23 +3952,23 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) } - if(pTITail) { /* could get cFuncs, cVars and cImplTypes from here + /* could get cFuncs, cVars and cImplTypes from here but we've already set those */ #define X(x) TRACE_(typelib)("tt "#x": %x\n",pTITail->res##x); - X(06); - X(16); - X(18); - X(1a); - X(1e); - X(24); - X(26); - X(2a); - X(2c); - X(2e); - X(30); - X(32); - X(34); - } + X(06); + X(16); + X(18); + X(1a); + X(1e); + X(24); + X(26); + X(2a); + X(2c); + X(2e); + X(30); + X(32); + X(34); +#undef X ppTypeInfoImpl = &((*ppTypeInfoImpl)->next); pBlk = (char*)pBlk + pBlkEntry[order].len; }

1 0

Marcus Meissner : kernel32: Handle username conversion failure (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 5493b77290a91045d9cd0154248da1ab0a67ad90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5493b77290a91045d9cd01542… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 11:50:21 2009 +0100 kernel32: Handle username conversion failure (Coverity). --- dlls/kernel32/process.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 942b97a..56e23b8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -495,6 +495,7 @@ static void set_additional_environment(void) MultiByteToWideChar( CP_UNIXCP, 0, name, -1, user_name, len ); SetEnvironmentVariableW( usernameW, user_name ); } + else WARN( "user name %s not convertible.\n", debugstr_a(name) ); /* set the USERPROFILE and ALLUSERSPROFILE variables */ @@ -522,8 +523,10 @@ static void set_additional_environment(void) strcpyW( value, profile_dir ); p = value + strlenW(value); if (p > value && p[-1] != '\\') *p++ = '\\'; - strcpyW( p, user_name ); - SetEnvironmentVariableW( userprofileW, value ); + if (user_name) { + strcpyW( p, user_name ); + SetEnvironmentVariableW( userprofileW, value ); + } if (all_users_dir) { strcpyW( p, all_users_dir );

1 0

Marcus Meissner : services: Handle realloc failures better (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 2c7ac13662915858046f2f94fe9fcb9d52c6ff96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7ac13662915858046f2f94f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 11:44:12 2009 +0100 services: Handle realloc failures better (Coverity). --- programs/services/services.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 003771f..9bed784 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -242,10 +242,12 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) { if (i+1 >= size) { + struct service_entry **slist_new; size *= 2; - services_list = HeapReAlloc(GetProcessHeap(), 0, services_list, size * sizeof(services_list[0])); - if (!services_list) + slist_new = HeapReAlloc(GetProcessHeap(), 0, services_list, size * sizeof(services_list[0])); + if (!slist_new) break; + services_list = slist_new; } services_list[i] = service; service->ref_count++;

1 0

Marcus Meissner : advapi32: Fixed NULL ptr deref in QueryServiceConfig2A ( Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 45a12690131da7a486167aeba16a5865546a65b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a12690131da7a486167aeba… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 11:40:02 2009 +0100 advapi32: Fixed NULL ptr deref in QueryServiceConfig2A (Coverity). --- dlls/advapi32/service.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index a76c27b..e0efa2b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1365,9 +1365,10 @@ BOOL WINAPI QueryServiceConfig2A(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe switch(dwLevel) { case SERVICE_CONFIG_DESCRIPTION: - { LPSERVICE_DESCRIPTIONA configA = (LPSERVICE_DESCRIPTIONA) buffer; + if (buffer && bufferW) { + LPSERVICE_DESCRIPTIONA configA = (LPSERVICE_DESCRIPTIONA) buffer; LPSERVICE_DESCRIPTIONW configW = (LPSERVICE_DESCRIPTIONW) bufferW; - if (configW->lpDescription) { + if (configW->lpDescription && (size > sizeof(SERVICE_DESCRIPTIONA))) { DWORD sz; configA->lpDescription = (LPSTR)(configA + 1); sz = WideCharToMultiByte( CP_ACP, 0, configW->lpDescription, -1, @@ -1380,10 +1381,11 @@ BOOL WINAPI QueryServiceConfig2A(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe } else configA->lpDescription = NULL; } - break; + break; default: FIXME("conversation W->A not implemented for level %d\n", dwLevel); ret = FALSE; + break; } cleanup:

1 0

Marcus Meissner : shell32: Fixed potential buffer overwrite in execute_from_key (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 0aa5a836886b54196966ae0ae1738fe961362a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa5a836886b54196966ae0ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 30 22:01:18 2009 +0100 shell32: Fixed potential buffer overwrite in execute_from_key (Coverity). --- dlls/shell32/shlexec.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 8a65636..1fbaabb 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -935,6 +935,8 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST /* Is there a replace() function anywhere? */ cmdlen /= sizeof(WCHAR); + if (cmdlen >= sizeof(cmd)/sizeof(WCHAR)) + cmdlen = sizeof(cmd)/sizeof(WCHAR)-1; cmd[cmdlen] = '\0'; SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); if (resultLen > sizeof(param)/sizeof(WCHAR))

1 0

Gerald Pfeifer : comctl32: Simplify four functions by removing unused parameters.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: bb6e8e56ce5d7581e54cac480c72c90518939d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6e8e56ce5d7581e54cac480… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 30 22:42:29 2009 +0100 comctl32: Simplify four functions by removing unused parameters. --- dlls/comctl32/syslink.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 5c25a52..8f48b4c 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1317,7 +1317,7 @@ static LRESULT SYSLINK_SendParentNotify (const SYSLINK_INFO *infoPtr, UINT code, * SYSLINK_SetFocus * Handles receiving the input focus. */ -static LRESULT SYSLINK_SetFocus (SYSLINK_INFO *infoPtr, HWND PrevFocusWindow) +static LRESULT SYSLINK_SetFocus (SYSLINK_INFO *infoPtr) { PDOC_ITEM Focus; @@ -1340,7 +1340,7 @@ static LRESULT SYSLINK_SetFocus (SYSLINK_INFO *infoPtr, HWND PrevFocusWindow) * SYSLINK_KillFocus * Handles losing the input focus. */ -static LRESULT SYSLINK_KillFocus (SYSLINK_INFO *infoPtr, HWND NewFocusWindow) +static LRESULT SYSLINK_KillFocus (SYSLINK_INFO *infoPtr) { PDOC_ITEM Focus; @@ -1385,7 +1385,7 @@ static PDOC_ITEM SYSLINK_LinkAtPt (const SYSLINK_INFO *infoPtr, const POINT *pt, * SYSLINK_LButtonDown * Handles mouse clicks */ -static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, DWORD Buttons, const POINT *pt) +static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, const POINT *pt) { PDOC_ITEM Current, Old; int id; @@ -1411,7 +1411,7 @@ static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, DWORD Buttons, const * SYSLINK_LButtonUp * Handles mouse clicks */ -static LRESULT SYSLINK_LButtonUp (SYSLINK_INFO *infoPtr, DWORD Buttons, const POINT *pt) +static LRESULT SYSLINK_LButtonUp (SYSLINK_INFO *infoPtr, const POINT *pt) { if(infoPtr->MouseDownID > -1) { @@ -1601,14 +1601,14 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, POINT pt; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - return SYSLINK_LButtonDown(infoPtr, wParam, &pt); + return SYSLINK_LButtonDown(infoPtr, &pt); } case WM_LBUTTONUP: { POINT pt; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - return SYSLINK_LButtonUp(infoPtr, wParam, &pt); + return SYSLINK_LButtonUp(infoPtr, &pt); } case WM_KEYDOWN: @@ -1694,10 +1694,10 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return SYSLINK_GetIdealHeight(infoPtr); case WM_SETFOCUS: - return SYSLINK_SetFocus(infoPtr, (HWND)wParam); + return SYSLINK_SetFocus(infoPtr); case WM_KILLFOCUS: - return SYSLINK_KillFocus(infoPtr, (HWND)wParam); + return SYSLINK_KillFocus(infoPtr); case WM_ENABLE: infoPtr->Style &= ~WS_DISABLED;

1 0

Nikolay Sivov : gdiplus: Implemented GdipTranslateClip/GdipTranslateClipI.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 5da52e0677ee5a3d234a669bd97df07287b683d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da52e0677ee5a3d234a669bd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jan 31 00:07:30 2009 +0300 gdiplus: Implemented GdipTranslateClip/GdipTranslateClipI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3716207..7e7bfbf 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -609,8 +609,8 @@ @ stdcall GdipTransformPoints(ptr long long ptr long) @ stdcall GdipTransformPointsI(ptr long long ptr long) @ stdcall GdipTransformRegion(ptr ptr) -@ stub GdipTranslateClip -@ stub GdipTranslateClipI +@ stdcall GdipTranslateClip(ptr long long) +@ stdcall GdipTranslateClipI(ptr long long) @ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) @ stub GdipTranslatePathGradientTransform diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5193334..039739b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3318,3 +3318,29 @@ HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void) return NULL; } + +/***************************************************************************** + * GdipTranslateClip [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics *graphics, REAL dx, REAL dy) +{ + TRACE("(%p, %.2f, %.2f)\n", graphics, dx, dy); + + if(!graphics) + return InvalidParameter; + + return GdipTranslateRegion(graphics->clip, dx, dy); +} + +/***************************************************************************** + * GdipTranslateClipI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics *graphics, INT dx, INT dy) +{ + TRACE("(%p, %d, %d)\n", graphics, dx, dy); + + if(!graphics) + return InvalidParameter; + + return GdipTranslateRegion(graphics->clip, (REAL)dx, (REAL)dy); +}

1 0

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 February 2009