wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Huw Davies : shell32: Remove an extraneous '@'.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: ccb3f4175f2652db790756c755053145433b787b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb3f4175f2652db790756c75… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 24 16:01:38 2017 +0100 shell32: Remove an extraneous '@'. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6751e57e0b846e3021f0179642a33c35b74b64ef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rgs b/dlls/shell32/shell32.rgs index 79bf4b7..877be6b 100644 --- a/dlls/shell32/shell32.rgs +++ b/dlls/shell32/shell32.rgs @@ -9,7 +9,7 @@ HKCR '{645FF040-5081-101B-9F08-00AA002F954E}' { val LocalizedString = s '@%MODULE%,-8964' - DefaultIcon = s '@%MODULE%,-33' + DefaultIcon = s '%MODULE%,-33' } '{00021401-0000-0000-C000-000000000046}' { shellex { MayChangeDefaultMenu } } }

1 0

Zebediah Figura : msacm32: Rewrite PCM conversion functions.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 49a5a97ac999f092d8152834f8bfddfe668eb3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a5a97ac999f092d8152834f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 15 13:25:48 2017 -0500 msacm32: Rewrite PCM conversion functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cadedd73f968fc981e86e020cfe00b32ce9de752) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/pcmconverter.c | 584 +++++++++++++++++++++++--------------------- dlls/msacm32/tests/msacm.c | 99 ++++++++ 2 files changed, 399 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49a5a97ac999f092d8152…

1 0

Hugh McMaster : uninstaller: Pass RegQueryValueExW() the size of the buffer (Coverity).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 99a95a8b6fb0f16be3d7521c46137263093df7cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a95a8b6fb0f16be3d7521c4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 15 08:02:31 2017 +0000 uninstaller: Pass RegQueryValueExW() the size of the buffer (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 581533b65c7d6144c66ad03423453ca12fc2b6b9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/uninstaller/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 6909e0f..1c834ea 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -228,6 +228,7 @@ static int FetchFromRootKey(HKEY root) for (i=0; RegEnumKeyExW( root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL ) != ERROR_NO_MORE_ITEMS; ++i) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); + size = sizeof(value); if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &type, (LPBYTE)&value, &size) && type == REG_DWORD && value == 1) {

1 0

Marcus Meissner : gameux: Avoid freeing uninitialized interfaces (Coverity ).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 2623edee0d5d59a8b5f41f76128534e5d36e1975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2623edee0d5d59a8b5f41f761… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 15 10:16:12 2017 +0200 gameux: Avoid freeing uninitialized interfaces (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 08193ed72b2b134a2079d261944f456438460c8d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gameux/gamestatistics.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index b9e913e..0ee449a 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -111,9 +111,9 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) static const WCHAR sValue[] = {'V','a','l','u','e',0}; HRESULT hr = S_OK; - IXMLDOMDocument *document; - IXMLDOMElement *root, *statisticsElement; - IXMLDOMNode *categoryNode, *statisticsNode; + IXMLDOMDocument *document = NULL; + IXMLDOMElement *root = NULL, *statisticsElement = NULL; + IXMLDOMNode *categoryNode = NULL, *statisticsNode = NULL; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, bstrStatistic = NULL, bstrName = NULL, bstrValue = NULL; @@ -209,8 +209,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMElement_setAttribute(categoryElement, bstrName, vValue); } - if (categoryElement) - IXMLDOMElement_Release(categoryElement); + if (categoryElement) IXMLDOMElement_Release(categoryElement); SysFreeString(V_BSTR(&vValue)); @@ -266,15 +265,16 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMNode_appendChild(categoryNode, statisticsNode, NULL); - IXMLDOMElement_Release(statisticsElement); - IXMLDOMNode_Release(statisticsNode); + if (statisticsElement) IXMLDOMElement_Release(statisticsElement); + if (statisticsNode) IXMLDOMNode_Release(statisticsNode); } } if(SUCCEEDED(hr)) hr = IXMLDOMElement_appendChild(root, categoryNode, &categoryNode); - IXMLDOMNode_Release(categoryNode); + if (categoryNode) + IXMLDOMNode_Release(categoryNode); if(FAILED(hr)) break; @@ -283,7 +283,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_putref_documentElement(document, root); - IXMLDOMElement_Release(root); + if (root) IXMLDOMElement_Release(root); TRACE("saving game statistics in %s file\n", debugstr_w(stats->sStatsFile)); if(SUCCEEDED(hr)) @@ -292,7 +292,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_save(document, vStatsFilePath); - IXMLDOMDocument_Release(document); + if (document) IXMLDOMDocument_Release(document); SysFreeString(bstrValue); SysFreeString(bstrName); @@ -426,9 +426,9 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) HRESULT hr = S_OK; IXMLDOMDocument *document = NULL; - IXMLDOMElement *root = NULL, *categoryElement, *statisticElement; - IXMLDOMNode *categoryNode, *statisticNode; - IXMLDOMNodeList *rootChildren = NULL, *categoryChildren; + IXMLDOMElement *root = NULL, *categoryElement = NULL, *statisticElement = NULL; + IXMLDOMNode *categoryNode = NULL, *statisticNode = NULL; + IXMLDOMNodeList *rootChildren = NULL, *categoryChildren = NULL; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, bstrStatistic = NULL, bstrName = NULL, bstrValue = NULL; @@ -571,22 +571,22 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) debugstr_w(data->categories[i].stats[j].sName), debugstr_w(data->categories[i].stats[j].sValue)); } - IXMLDOMElement_Release(statisticElement); + if (statisticElement) IXMLDOMElement_Release(statisticElement); } - IXMLDOMNode_Release(statisticNode); + if (statisticNode) IXMLDOMNode_Release(statisticNode); } } - IXMLDOMNodeList_Release(categoryChildren); + if (categoryChildren) IXMLDOMNodeList_Release(categoryChildren); if(SUCCEEDED(hr)) hr = S_OK; } - IXMLDOMElement_Release(categoryElement); + if (categoryElement) IXMLDOMElement_Release(categoryElement); } - IXMLDOMNode_Release(categoryNode); + if (categoryNode) IXMLDOMNode_Release(categoryNode); } } if(SUCCEEDED(hr))

1 0

Marcus Meissner : msvcrt: Free the temporary filename (Coverity).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 47876de741048659911fc630d5acdedfdf99b969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47876de741048659911fc630d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 20 09:08:39 2017 +0200 msvcrt: Free the temporary filename (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d3d43ffdedcf765ecbd0ec160f384156069849bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b1c66e5..51d2e23 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4989,6 +4989,7 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) if(fd != -1 && !file) MSVCRT__close(fd); + MSVCRT_free(filename); UNLOCK_FILES(); return file; }

1 0

André Hentschel : oleview: Fix bytecount for memmoves (Coverity).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 79e6537c10b46f8342b77a1c6e73678d2401143b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e6537c10b46f8342b77a1c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:08 2017 +0100 oleview: Fix bytecount for memmoves (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dd3c58c497a58189f5ead6d223f3f8d610d4b3c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/oleview/details.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index b194f6f..fda9b7c 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -139,7 +139,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad } else if(addings && !memcmp(wszName, wszProxyStubClsid32, sizeof(WCHAR[17]))) { - lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + lenData = sizeof(wszData); RegQueryValueW(hCurKey, NULL, wszData, (LONG *)&lenData); RegCloseKey(hCurKey); @@ -155,7 +155,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[6], wszData, lenData * sizeof(WCHAR)); + memmove(&wszData[6], wszData, lenData); memcpy(wszData, wszCLSID, sizeof(WCHAR[6])); wszData[5] = '\\'; @@ -183,7 +183,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[8], wszData, lenData * sizeof(WCHAR)); + memmove(&wszData[8], wszData, lenData); memcpy(wszData, wszTypeLib, sizeof(WCHAR[8])); wszData[7] = '\\'; RegOpenKeyW(HKEY_CLASSES_ROOT, wszData, &hCurKey); @@ -229,12 +229,11 @@ static void CreateReg(WCHAR *buffer) *path = '\\'; path += 1; - lenTree = sizeof(WCHAR[MAX_LOAD_STRING]); + lenTree = sizeof(wszTree); if(RegQueryValueW(hKey, NULL, wszTree, (LONG *)&lenTree) == ERROR_SUCCESS) { - memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, - lenTree * sizeof(WCHAR)); + memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, lenTree); memcpy(wszTree, &buffer[lastLenBuffer], (lenBuffer - lastLenBuffer) * sizeof(WCHAR));

1 0

Hugh McMaster : regedit: Prevent out-of-bounds reads when unescaping a string (Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: b12440fe31d56411c444d89a1e9db24ec3571411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12440fe31d56411c444d89a1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 26 13:15:57 2017 +0000 regedit: Prevent out-of-bounds reads when unescaping a string (Valgrind). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 976c2aa649a526188afd9c0647869ccc82068341) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/regproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 5e4c2d2..4d61ab1 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -275,6 +275,7 @@ static int REGPROC_unescape_string(WCHAR* str) str[val_idx] = str[str_idx]; break; default: + if (!str[str_idx]) return FALSE; output_message(STRING_ESCAPE_SEQUENCE, str[str_idx]); str[val_idx] = str[str_idx]; break;

1 0

Hans Leidekker : msi: Avoid zero size allocations (Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 3736b7dbce3ba0e3ff1dec03d8e271e2124a1cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3736b7dbce3ba0e3ff1dec03d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 28 10:45:56 2017 +0200 msi: Avoid zero size allocations (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d12728a872b03a537ee6d92789fb6cbd2d86ba1d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/table.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 2b36091..b364d97 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -422,13 +422,11 @@ static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg goto err; } - t->row_count = rawsize / row_size; - t->data = msi_alloc_zero( t->row_count * sizeof (USHORT*) ); - if( !t->data ) - goto err; - t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL)); - if ( !t->data_persistent ) - goto err; + if ((t->row_count = rawsize / row_size)) + { + if (!(t->data = msi_alloc_zero( t->row_count * sizeof(USHORT *) ))) goto err; + if (!(t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL) ))) goto err; + } /* transpose all the data */ TRACE("Transposing data from %d rows\n", t->row_count );

1 0

Hans Leidekker : advpack: Don't trace the contents of an output buffer ( Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: ad68a529866b3d0003fef30fed91ff48438d4455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad68a529866b3d0003fef30fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:21 2017 +0100 advpack: Don't trace the contents of an output buffer (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c0b37037f5f00d2f68036ddeaf58aac3b7e5497f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/advpack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 2469f7b..d2ce60e 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -763,9 +763,9 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, HRESULT res; DWORD len = 0; - TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), - debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); if (!pszInfFilename || !pszTranslateSection || !pszTranslateKey || !pdwRequiredSize) @@ -843,9 +843,9 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, LPWSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), - debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); if (!hInf || !pszInfFilename || !pszTranslateSection || !pszTranslateKey) return E_INVALIDARG;

1 0

Hans Leidekker : wbemprox: Also free data for tables that don' t have a fill function (Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 64d406c8c47a02b41d0729396708d49e7dc2c064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d406c8c47a02b41d0729396… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:20 2017 +0100 wbemprox: Also free data for tables that don't have a fill function (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 66e3c97ca79f2dba590d281cfb4e04face345617) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 273b8cb..ad56e0c 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -334,6 +334,7 @@ void free_table( struct table *table ) TRACE("destroying %p\n", table); heap_free( (WCHAR *)table->name ); free_columns( (struct column *)table->columns, table->num_cols ); + heap_free( table->data ); list_remove( &table->entry ); heap_free( table ); }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
48
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 October 2017