wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Nikolay Sivov : d3drm: Avoid HRESULT codes for BOOL retval methods ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: f6689b6ce2ca5268b9c58ae2ea6b4e201ab05589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6689b6ce2ca5268b9c58ae2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:25:28 2015 +0300 d3drm: Avoid HRESULT codes for BOOL retval methods (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 4f9d952..f20040b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1073,7 +1073,7 @@ static BOOL WINAPI d3drm_frame2_GetBoxEnable(IDirect3DRMFrame2 *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI d3drm_frame2_GetAxes(IDirect3DRMFrame2 *iface, D3DVECTOR *dir, D3DVECTOR *up) @@ -1094,7 +1094,7 @@ static BOOL WINAPI d3drm_frame2_GetInheritAxes(IDirect3DRMFrame2 *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI d3drm_frame2_GetHierarchyBox(IDirect3DRMFrame2 *iface, D3DRMBOX *box) @@ -2014,7 +2014,7 @@ static BOOL WINAPI d3drm_frame3_GetBoxEnable(IDirect3DRMFrame3 *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI d3drm_frame3_GetAxes(IDirect3DRMFrame3 *iface, D3DVECTOR *dir, D3DVECTOR *up) @@ -2035,7 +2035,7 @@ static BOOL WINAPI d3drm_frame3_GetInheritAxes(IDirect3DRMFrame3 *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI d3drm_frame3_GetHierarchyBox(IDirect3DRMFrame3 *iface, D3DRMBOX *box)

1 0

Nikolay Sivov : amstream/tests: Correct sizeof expression to actually get array size (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: b752d3d44b05fd6d02b03d73ef488bf85b08c3bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b752d3d44b05fd6d02b03d73e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:15:56 2015 +0300 amstream/tests: Correct sizeof expression to actually get array size (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 909a738..1fcffea 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -425,9 +425,9 @@ static void test_media_streams(void) ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); - hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(AM_MEDIA_TYPE), media_types, &nb_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(media_types[0]), media_types, &nb_media_types); ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); - ok(nb_media_types == 0, "nb_media_types should be 0 instead of %u\n", nb_media_types); + ok(nb_media_types > 0, "nb_media_types should be >0\n"); IEnumMediaTypes_Release(enum_media_types); IPin_Release(pins[i]); }

1 0

Nikolay Sivov : msvcrt/tests: Use matching type to get array element count (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: d8623f82419327583a917a6769102854cc32da5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8623f82419327583a917a676… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:07:19 2015 +0300 msvcrt/tests: Use matching type to get array element count (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7733a7c..4144d17 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1108,7 +1108,7 @@ static void test__wcslwr_s(void) /* Test NULL input string and valid size. */ errno = EBADF; - ret = p_wcslwr_s(NULL, sizeof(buffer)/sizeof(wchar_t)); + ret = p_wcslwr_s(NULL, sizeof(buffer)/sizeof(buffer[0])); ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno);

1 0

Nikolay Sivov : msvcirt: Use proper printf format for pointers (PVS-Studio ).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 472f4acb06a35fc2985500deef3ee2c604a6d9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=472f4acb06a35fc2985500dee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 21:44:50 2015 +0300 msvcirt: Use proper printf format for pointers (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f590d0e..09f488a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -825,8 +825,8 @@ void __thiscall streambuf_dbp(streambuf *this) } else { printf("_fAlloc=%d\n", this->allocated); printf(" base()=%p, ebuf()=%p, blen()=%d\n", this->base, this->ebuf, streambuf_blen(this)); - printf("pbase()=%p, pptr()=%p, epptr()=%d\n", this->pbase, this->pptr, this->epptr); - printf("eback()=%p, gptr()=%p, egptr()=%d\n", this->eback, this->gptr, this->egptr); + printf("pbase()=%p, pptr()=%p, epptr()=%p\n", this->pbase, this->pptr, this->epptr); + printf("eback()=%p, gptr()=%p, egptr()=%p\n", this->eback, this->gptr, this->egptr); } }

1 0

Dmitry Timoshkov : mshtml: Handle memory allocation failure when creating IOleUndoManager.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: e8b9bda53ac39c913ddc93de0308f0c8b69605fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b9bda53ac39c913ddc93de0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 12 11:21:20 2015 +0800 mshtml: Handle memory allocation failure when creating IOleUndoManager. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 56744e6..8b2a6b7 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -197,6 +197,8 @@ static IOleUndoManager *create_undomgr(void) { UndoManager *ret = heap_alloc(sizeof(UndoManager)); + if (!ret) return NULL; + ret->IOleUndoManager_iface.lpVtbl = &OleUndoManagerVtbl; ret->ref = 1; @@ -246,6 +248,9 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG if(!This->doc_obj->undomgr) This->doc_obj->undomgr = create_undomgr(); + if (!This->doc_obj->undomgr) + return E_OUTOFMEMORY; + return IOleUndoManager_QueryInterface(This->doc_obj->undomgr, riid, ppv); }

1 0

Bruno Jesus : urlmon: Ignore unsupported flags for CoInternetSetFeatureEnabled.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 49bdb815bf60a7ac40160da60836be69d9c4beaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=49bdb815bf60a7ac40160da60… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Oct 11 18:32:30 2015 +0800 urlmon: Ignore unsupported flags for CoInternetSetFeatureEnabled. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/internet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index e5d41b6..d7deccc 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -536,10 +536,8 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO if(feature >= FEATURE_ENTRY_COUNT) return E_FAIL; - if(flags & ~supported_flags) { + if(flags & ~supported_flags) FIXME("Unsupported flags: %08x\n", flags & ~supported_flags); - return E_NOTIMPL; - } if(flags & SET_FEATURE_ON_PROCESS) set_feature_on_process(feature, enable);

1 0

Qian Hong : dbghelp: Parse DW_TAG_const_type inside dwarf2_parse_subprogram.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: fd9d4b6232b8ba39fb1f0a25a17fa841449caa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9d4b6232b8ba39fb1f0a25a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Oct 9 19:59:58 2015 +0800 dbghelp: Parse DW_TAG_const_type inside dwarf2_parse_subprogram. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4c093a3..655c586 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1978,6 +1978,9 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, case DW_TAG_pointer_type: dwarf2_parse_pointer_type(subpgm.ctx, di); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(subpgm.ctx, di); + break; case DW_TAG_subprogram: /* FIXME: likely a declaration (to be checked) * skip it for now

1 0

Qian Hong : dbghelp: Parse DW_TAG_const_type inside dwarf2_parse_subprogram_block.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 62d6a0908576c4a954060cb957cf0024e0750de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d6a0908576c4a954060cb95… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Oct 9 19:59:38 2015 +0800 dbghelp: Parse DW_TAG_const_type inside dwarf2_parse_subprogram_block. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9e0c7d1..4c093a3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1843,6 +1843,9 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, case DW_TAG_subroutine_type: dwarf2_parse_subroutine_type(subpgm->ctx, di); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(subpgm->ctx, di); + break; case DW_TAG_lexical_block: dwarf2_parse_subprogram_block(subpgm, block, child); break;

1 0

Riccardo Bortolato : d3d9: Don' t use a wined3d_surface in d3d9_surface_GetDesc.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 9b02e116bdc4a9a9e5a47faca75a4483952923eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b02e116bdc4a9a9e5a47faca… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:12 2015 +0200 d3d9: Don't use a wined3d_surface in d3d9_surface_GetDesc. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 83c90ab..ed00f7a 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -208,13 +208,13 @@ static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_ { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);

1 0

Riccardo Bortolato : d3d9: Make use of wined3d_texture_unmap in d3d9_surface_UnlockRect.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 736ca38d11b82b1a25333e4a48b5d37717fa7914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736ca38d11b82b1a25333e4a4… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:11 2015 +0200 d3d9: Make use of wined3d_texture_unmap in d3d9_surface_UnlockRect. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index ec5b420..83c90ab 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -272,7 +272,7 @@ static HRESULT WINAPI d3d9_surface_UnlockRect(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_surface_unmap(surface->wined3d_surface); + hr = wined3d_texture_unmap(surface->wined3d_texture, surface->sub_resource_idx); wined3d_mutex_unlock(); switch(hr)

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
75
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 2015