August 2012 - Wine-commits - list.winehq.org

Marcus Meissner : hhctrl.ocx: Initialize ret on some error paths (Coverity) .
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 2461466ba0689534081f51fe3fac7ec9cd84ee34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2461466ba0689534081f51fe3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 18 11:55:52 2012 +0200 hhctrl.ocx: Initialize ret on some error paths (Coverity). --- dlls/hhctrl.ocx/chm.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 02931f4..6c2904d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -326,7 +326,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) HH_WINTYPEW wintype; HRESULT hr; DWORD cbRead; - BOOL ret; + BOOL ret = FALSE; static const WCHAR null[] = {0}; static const WCHAR toc_extW[] = {'h','h','c',0}; @@ -357,8 +357,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) pszJump2 = ConvertChmString(info, &wintype.pszJump2); pszUrlJump1 = ConvertChmString(info, &wintype.pszUrlJump1); pszUrlJump2 = ConvertChmString(info, &wintype.pszUrlJump2); - - ret = SUCCEEDED(hr); } else { @@ -378,7 +376,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) wintype.dwExStyles = 0; wintype.nShowState = SW_SHOW; wintype.curNavType = HHWIN_NAVTYPE_TOC; - ret = TRUE; } /* merge the new data with any pre-existing HH_WINTYPE structure */ @@ -400,6 +397,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) heap_free(pszJump2); heap_free(pszUrlJump1); heap_free(pszUrlJump2); + ret = TRUE; done: if (pStream)

1 0

Marcus Meissner : riched20: Fixed pointer to value out of scope (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 3a2de10a9ccdb6a93930aa76e582d6bc397d0347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2de10a9ccdb6a93930aa76e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 18 11:56:12 2012 +0200 riched20: Fixed pointer to value out of scope (Coverity). --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 18cd159..6221f4b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -292,6 +292,7 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea do { LONG nWideChars = 0; + WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; if (!stream->dwSize) { @@ -305,7 +306,6 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea if (!(dwFormat & SF_UNICODE)) { - WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; char * buf = stream->buffer; DWORD size = stream->dwSize; DWORD cp = CP_ACP;

1 0

Piotr Caban : msvcp90: Fixed buffer allocation in basic_stringbuf<wchar> class.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: e40d02868d26a402abc8402299daccd2d6a2f5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40d02868d26a402abc840229… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 18 14:54:17 2012 +0200 msvcp90: Fixed buffer allocation in basic_stringbuf<wchar> class. --- dlls/msvcp100/ios.c | 4 ++-- dlls/msvcp90/ios.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 1bc8ee2..4969c7b 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -3946,7 +3946,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w this->seekhigh = NULL; if(count && str) { - wchar_t *buf = MSVCRT_operator_new(count); + wchar_t *buf = MSVCRT_operator_new(count*sizeof(wchar_t)); if(!buf) { ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); @@ -4120,7 +4120,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar * oldsize = (ptr ? basic_streambuf_wchar_epptr(&this->base)-basic_streambuf_wchar_eback(&this->base): 0); size = oldsize|0xf; size += size/2; - buf = MSVCRT_operator_new(size); + buf = MSVCRT_operator_new(size*sizeof(wchar_t)); if(!buf) { ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a0e54ad..fd2f6a7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3932,7 +3932,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w this->seekhigh = NULL; if(count && str) { - wchar_t *buf = MSVCRT_operator_new(count); + wchar_t *buf = MSVCRT_operator_new(count*sizeof(wchar_t)); if(!buf) { ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); @@ -4106,7 +4106,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar * oldsize = (ptr ? basic_streambuf_wchar_epptr(&this->base)-basic_streambuf_wchar_eback(&this->base): 0); size = oldsize|0xf; size += size/2; - buf = MSVCRT_operator_new(size); + buf = MSVCRT_operator_new(size*sizeof(wchar_t)); if(!buf) { ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL);

1 0

Nikolay Sivov : amstream: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: bd102b527690dd4e937021da82f6f68b3a6573d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd102b527690dd4e937021da8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:11:05 2012 +0400 amstream: Call interface methods properly. --- dlls/amstream/amstream.c | 6 +++--- dlls/amstream/audiodata.c | 2 +- dlls/amstream/mediastream.c | 4 ++-- dlls/amstream/tests/amstream.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index c61fcd0..293e2b9 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -87,8 +87,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream IsEqualGUID(riid, &IID_IMultiMediaStream) || IsEqualGUID(riid, &IID_IAMMultiMediaStream)) { - IUnknown_AddRef(iface); - *ppvObject = This; + IAMMultiMediaStream_AddRef(iface); + *ppvObject = iface; return S_OK; } @@ -306,7 +306,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream return E_POINTER; if (This->pFilterGraph) - return IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); + return IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); else *ppGraphBuilder = NULL; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 7d3c38a..2bd57da 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -48,7 +48,7 @@ static HRESULT WINAPI IAudioDataImpl_QueryInterface(IAudioData *iface, REFIID ri IsEqualGUID(riid, &IID_IMemoryData) || IsEqualGUID(riid, &IID_IAudioData)) { - IUnknown_AddRef(iface); + IAudioData_AddRef(iface); *ret_iface = iface; return S_OK; } diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 6656bf7..295796b 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -60,8 +60,8 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMedia IsEqualGUID(riid, &IID_IMediaStream) || IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) { - IUnknown_AddRef(iface); - *ppv = This; + IDirectDrawMediaStream_AddRef(iface); + *ppv = iface; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index ffc6fe0..06fb330 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -155,7 +155,7 @@ static void test_renderfile(void) error: if (pddsample) - IDirectDrawMediaSample_Release(pddsample); + IDirectDrawStreamSample_Release(pddsample); if (pddstream) IDirectDrawMediaStream_Release(pddstream); if (pvidstream) @@ -260,7 +260,7 @@ static void test_media_streams(void) } if (ddraw_sample) - IDirectDrawMediaSample_Release(ddraw_sample); + IDirectDrawStreamSample_Release(ddraw_sample); if (ddraw_stream) IDirectDrawMediaStream_Release(ddraw_stream); }

1 0

Nikolay Sivov : browseui: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: ab5c3ad8dafd6a8fd7ad3ea38bfb4cb6e5ada1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5c3ad8dafd6a8fd7ad3ea38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:15:15 2012 +0400 browseui: Call interface methods properly. --- dlls/browseui/aclmulti.c | 2 +- dlls/browseui/aclsource.c | 2 +- dlls/browseui/progressdlg.c | 2 +- dlls/browseui/tests/progressdlg.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 0ca6758..bfb200c 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -113,7 +113,7 @@ static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LP if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumString_AddRef(iface); return S_OK; } diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index c151878..8b3530f 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -72,7 +72,7 @@ static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid, if (*ppvOut) { - IUnknown_AddRef(iface); + IACList2_AddRef(iface); return S_OK; } diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index e91d9cb..7d478cc 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -291,7 +291,7 @@ static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFI if (*ppvOut) { - IUnknown_AddRef(iface); + IProgressDialog_AddRef(iface); return S_OK; } diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c index e4d0e2f..2203714 100644 --- a/dlls/browseui/tests/progressdlg.c +++ b/dlls/browseui/tests/progressdlg.c @@ -39,19 +39,19 @@ static void test_IProgressDialog_QueryInterface(void) return; } - hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, NULL); + hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); - hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); + hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } - hr = IUnknown_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); + hr = IProgressDialog_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); ok(hr == S_OK, "QueryInterface (IOleWindow) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { - hr = IUnknown_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); + hr = IOleWindow_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); ok(hr == S_OK, "QueryInterface (IProgressDialog) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IProgressDialog_Release(dlg2);

1 0

Nikolay Sivov : comctl32: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 21897a96892c49e45271dd88dd4c5ca9ccc0fd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21897a96892c49e45271dd88d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:19:41 2012 +0400 comctl32: Call interface methods properly. --- dlls/comctl32/imagelist.c | 6 +++--- dlls/comctl32/tests/imagelist.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 4d18597..6142ba7 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3366,7 +3366,7 @@ static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst, return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (FAILED(IImageList_QueryInterface(punkSrc, &IID_IImageList, + if (FAILED(IUnknown_QueryInterface(punkSrc, &IID_IImageList, (void **) &src))) return E_FAIL; @@ -3390,7 +3390,7 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, TRACE("(%p)->(%d %p %d %d %d %s %p)\n", iface, i1, punk2, i2, dx, dy, debugstr_guid(riid), ppv); /* TODO: Add test for IID_ImageList2 too */ - if (FAILED(IImageList_QueryInterface(punk2, &IID_IImageList, + if (FAILED(IUnknown_QueryInterface(punk2, &IID_IImageList, (void **) &iml2))) return E_FAIL; @@ -3523,7 +3523,7 @@ static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList *iface, return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (FAILED(IImageList_QueryInterface(punk, &IID_IImageList, + if (FAILED(IUnknown_QueryInterface(punk, &IID_IImageList, (void **) &iml2))) return E_FAIL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 2e316f7..98b84a6 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1423,7 +1423,7 @@ static void test_iimagelist(void) /* test reference counting on destruction */ imgl = (IImageList*)createImageList(32, 32); - ret = IUnknown_AddRef(imgl); + ret = IImageList_AddRef(imgl); ok(ret == 2, "Expected 2, got %d\n", ret); ret = ImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -1433,7 +1433,7 @@ static void test_iimagelist(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); imgl = (IImageList*)createImageList(32, 32); - ret = IUnknown_AddRef(imgl); + ret = IImageList_AddRef(imgl); ok(ret == 2, "Expected 2, got %d\n", ret); ret = ImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);

1 0

Nikolay Sivov : gameux: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: fa4148d2ae70396c60c6f70b1542794377b79572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4148d2ae70396c60c6f70b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:41:52 2012 +0400 gameux: Call interface methods properly. --- dlls/gameux/gameexplorer.c | 2 +- dlls/gameux/gamestatistics.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 556bf36..1f51f12 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -376,7 +376,7 @@ static HRESULT GAMEUX_ParseGameDefinition( IXMLDOMElement_Release(nextElement); } - IXMLDOMElement_Release(nextNode); + IXMLDOMNode_Release(nextNode); } } while(hr == S_OK); diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 0116304..f069708 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -261,7 +261,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) SysFreeString(V_BSTR(&vValue)); if(SUCCEEDED(hr)) - hr = IXMLDOMElement_appendChild(categoryNode, statisticsNode, &statisticsNode); + hr = IXMLDOMNode_appendChild(categoryNode, statisticsNode, &statisticsNode); IXMLDOMElement_Release(statisticsElement); IXMLDOMNode_Release(statisticsNode);

1 0

Nikolay Sivov : itss: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 316ca9edacfb56bfa2d8157de99e3929f1446312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316ca9edacfb56bfa2d8157de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:48:22 2012 +0400 itss: Call interface methods properly. --- dlls/itss/itss.c | 4 ++-- dlls/itss/moniker.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index fc2eb37..94687d8 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -196,8 +196,8 @@ static HRESULT WINAPI ITStorageImpl_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IITStorage)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IITStorage_AddRef(iface); + *ppvObject = iface; return S_OK; } diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 02edd49..dedf4e5 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -65,8 +65,8 @@ static HRESULT WINAPI ITS_IMonikerImpl_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IMoniker_AddRef(iface); + *ppvObject = iface; return S_OK; } @@ -395,8 +395,8 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IParseDisplayName_AddRef(iface); + *ppvObject = iface; return S_OK; }

1 0

Nikolay Sivov : mciqtz: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 7f4d634e80dd30859b750ca04d19bb244e276174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4d634e80dd30859b750ca04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:53:45 2012 +0400 mciqtz: Call interface methods properly. --- dlls/mciqtz32/mciqtz.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index b05e681..546f3ed 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -241,13 +241,13 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, err: if (wma->vidbasic) - IUnknown_Release(wma->vidbasic); + IBasicVideo_Release(wma->vidbasic); wma->vidbasic = NULL; if (wma->seek) - IUnknown_Release(wma->seek); + IMediaSeeking_Release(wma->seek); wma->seek = NULL; if (wma->vidwin) - IUnknown_Release(wma->vidwin); + IVideoWindow_Release(wma->vidwin); wma->vidwin = NULL; if (wma->pgraph) IGraphBuilder_Release(wma->pgraph); @@ -282,9 +282,9 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); if (wma->opened) { - IUnknown_Release(wma->vidwin); - IUnknown_Release(wma->vidbasic); - IUnknown_Release(wma->seek); + IVideoWindow_Release(wma->vidwin); + IBasicVideo_Release(wma->vidbasic); + IMediaSeeking_Release(wma->seek); IMediaEvent_Release(wma->mevent); IGraphBuilder_Release(wma->pgraph); IMediaControl_Release(wma->pmctrl);

1 0

Nikolay Sivov : mlang: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 64e94c22c9648c5ac2a604602cb33ef85cf4933d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e94c22c9648c5ac2a604602… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:55:54 2012 +0400 mlang: Call interface methods properly. --- dlls/mlang/mlang.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 2c6e6f7..775a723 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2883,7 +2883,7 @@ static HRESULT WINAPI fnIMultiLanguage2_GetLcidFromRfc1766( if (!pLocale || !bstrRfc1766) return E_INVALIDARG; - hr = IMultiLanguage2_EnumRfc1766(iface, 0, &rfc1766); + hr = IMultiLanguage3_EnumRfc1766(iface, 0, &rfc1766); if (FAILED(hr)) return hr; @@ -3094,7 +3094,7 @@ static HRESULT WINAPI fnIMultiLanguage2_ValidateCodePage( UINT uiCodePage, HWND hwnd) { - return IMultiLanguage2_ValidateCodePageEx(iface,uiCodePage,hwnd,0); + return IMultiLanguage3_ValidateCodePageEx(iface,uiCodePage,hwnd,0); } static HRESULT WINAPI fnIMultiLanguage2_GetCodePageDescription( @@ -3132,7 +3132,7 @@ static HRESULT WINAPI fnIMultiLanguage2_IsCodePageInstallable( TRACE("%u\n", uiCodePage); /* FIXME: the installable set is usually larger than the set of valid codepages */ - return IMultiLanguage2_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); + return IMultiLanguage3_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); } static HRESULT WINAPI fnIMultiLanguage2_SetMimeDBSource(

1 0