October 2017 - Wine-commits

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

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

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

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

Nikolay Sivov : include: Fix IShellFolderView method macros.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 8637f4ffc4887dd331a6bb34f83c41c489183d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8637f4ffc4887dd331a6bb34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 08:51:44 2017 +0300 include: Fix IShellFolderView method macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 16d21d94c182b0a5ce3b9b22a5049e2eb1d425e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/shlobj.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index c40be95..88f4b41 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -652,11 +652,11 @@ DECLARE_INTERFACE_(IShellFolderView, IUnknown) #define IShellFolderView_GetDropPoint(p,a) (p)->lpVtbl->GetDropPoint(p,a) #define IShellFolderView_MoveIcons(p,a) (p)->lpVtbl->MoveIcons(p,a) #define IShellFolderView_SetItemPos(p,a,b) (p)->lpVtbl->SetItemPos(p,a,b) -#define IShellFolderView_DropTarget(p,a) (p)->lpVtbl->DropTarget(p,a) +#define IShellFolderView_IsBkDropTarget(p,a) (p)->lpVtbl->IsBkDropTarget(p,a) #define IShellFolderView_SetClipboard(p,a) (p)->lpVtbl->SetClipboard(p,a) #define IShellFolderView_SetPoints(p,a) (p)->lpVtbl->SetPoints(p,a) #define IShellFolderView_GetItemSpacing(p,a) (p)->lpVtbl->GetItemSpacing(p,a) -#define IShellFolderView_SetCallback(p,a) (p)->lpVtbl->SetCallback(p,a) +#define IShellFolderView_SetCallback(p,a,b) (p)->lpVtbl->SetCallback(p,a,b) #define IShellFolderView_Select(p,a) (p)->lpVtbl->Select(p,a) #define IShellFolderView_QuerySupport(p,a) (p)->lpVtbl->QuerySupport(p,a) #define IShellFolderView_SetAutomationObject(p,a) (p)->lpVtbl->SetAutomationObject(p,a)

1 0

Ken Thomases : gdiplus: Avoid infinite recursion in flatten_bezier().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: d1ed9d7310a34d784bbe7eb65afc5d8406fe1930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ed9d7310a34d784bbe7eb65… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:16:08 2017 -0500 gdiplus: Avoid infinite recursion in flatten_bezier(). If either of the recursive calls would have the same x2, y2, x3, and y3 arguments as the current call, the path is as flat as the precision of floats allows. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a3f0a5913299d675426e039b5f1d794993144fbf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5a3356a..4d70796 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -142,6 +142,10 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R mp[2].X = (mp[1].X + mp[3].X) / 2.0; mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; + if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || + (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) + return TRUE; + pt = end->pt; pt_st = start->pt; /* check flatness as a half of distance between middle point and a linearized path */

1 0

Michael Müller : include: Fix an invalid UUID in dxva2api.idl.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 305c86b0bcbed42359ddd4756c03e9eec52ba488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305c86b0bcbed42359ddd4756… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 24 16:27:25 2017 +0200 include: Fix an invalid UUID in dxva2api.idl. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11a1ceebc3544dd7954f4ef140a913cd722aa286) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/dxva2api.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index ebd508b..7a29157 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -434,7 +434,7 @@ interface IDirectXVideoDecoder : IUnknown */ [ object, - uuid(fc51a551-d5e7-11d9-af55-00054e43ff02), + uuid(fc51a552-d5e7-11d9-af55-00054e43ff02), local ] interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService

1 0

Nikolay Sivov : shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: f2561f395fda36e27794ac3e6ceb402757636d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2561f395fda36e27794ac3e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 13:21:42 2017 +0300 shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5badc91a0fe9933f0dc60ca8a74b68cf66559b0d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/ebrowser.c | 3 ++- dlls/shell32/tests/ebrowser.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index bbccf88..07046502 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -782,7 +782,8 @@ static HRESULT WINAPI IExplorerBrowser_fnQueryInterface(IExplorerBrowser *iface, { *ppvObject = &This->IExplorerBrowser_iface; } - else if(IsEqualIID(riid, &IID_IShellBrowser)) + else if(IsEqualIID(riid, &IID_IShellBrowser) || + IsEqualIID(riid, &IID_IOleWindow)) { *ppvObject = &This->IShellBrowser_iface; } diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index c04a2b4..7db5842 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -575,7 +575,7 @@ static void test_QueryInterface(void) test_qinterface(IID_IUnknown, S_OK); test_qinterface(IID_IExplorerBrowser, S_OK); test_qinterface(IID_IShellBrowser, S_OK); - todo_wine test_qinterface(IID_IOleWindow, S_OK); + test_qinterface(IID_IOleWindow, S_OK); test_qinterface(IID_ICommDlgBrowser, S_OK); test_qinterface(IID_ICommDlgBrowser2, S_OK); test_qinterface(IID_ICommDlgBrowser3, S_OK);

1 0

Huw Davies : user32: Explicitly set last error to ERROR_SUCCESS.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: d76c5ad8b4a5244bca0016f9f43ae87e52672adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76c5ad8b4a5244bca0016f9f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 27 10:18:32 2017 +0100 user32: Explicitly set last error to ERROR_SUCCESS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0a36078ee1016053d746e77d1f636b018c537ff8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 827bee7..93b39b4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3288,6 +3288,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if( menu ) menu->bTimeToHide = FALSE; } + SetLastError( ERROR_SUCCESS ); /* The return value is only used by TrackPopupMenu */ if (!(wFlags & TPM_RETURNCMD)) return TRUE; if (executedMenuId == -1) executedMenuId = 0;

1 0

Zebediah Figura : winemp3.acm: Fix error in acmStreamSize().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 66dfa1841df6b8d6e5587c936f4d5c60efb79c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66dfa1841df6b8d6e5587c936… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:36 2017 -0500 winemp3.acm: Fix error in acmStreamSize(). 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 ffebb919101120feb55cef43bf48e1d142693ebf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index cc6008d..13a6109 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -940,11 +940,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nBlockAlign * 1152)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || @@ -952,11 +952,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; } else

1 0