wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Jacek Caban : mshtml/tests: Fixed more test failures on win10.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 79c59085b1b1f487e91c2695028dd3d1d257a468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c59085b1b1f487e91c26950… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 14:49:18 2015 +0100 mshtml/tests: Fixed more test failures on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0e7781b..89834ac 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -872,7 +872,12 @@ static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(riid, &IID_INewWindowManager)) { + *ppv = iface; + return S_OK; + } + + trace("NewWindowManager_QueryInterface %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -2873,8 +2878,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { - if(nCmdID != 63 && nCmdID != 178 && (!is_refresh || nCmdID != 37)) - test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2888,6 +2891,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID test_readyState(NULL); load_state = LD_LOADING; }else { + if(!is_refresh) + test_readyState(NULL); if(nav_url) test_GetCurMoniker(doc_unk, NULL, nav_serv_url, FALSE); else if(load_from_stream) @@ -2951,6 +2956,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(pvaIn) ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut)=%d\n", V_VT(pvaOut)); + test_readyState(NULL); return E_NOTIMPL; case 103: @@ -2959,6 +2965,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 105: @@ -2967,12 +2974,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 138: CHECK_EXPECT2(Exec_ShellDocView_138); ok(!pvaIn, "pvaIn != NULL\n"); ok(!pvaOut, "pvaOut != NULL\n"); + test_readyState(NULL); return S_OK; case 140: @@ -2981,6 +2990,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 83:

1 0

Nikolay Sivov : crypt32/tests: Fix printf format (PVS-Studio).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 1b8f84cc3b1f752ee4574f75fc85d7c371bc8841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8f84cc3b1f752ee4574f75f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 00:27:26 2015 +0300 crypt32/tests: Fix printf format (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index b45b5f2..eae1282 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7262,7 +7262,7 @@ static void test_decodeNameConstraints(DWORD dwEncoding) if (constraints->cPermittedSubtree != encodedNameConstraints[i].constraints.cPermittedSubtree) - fprintf(stderr, "%d: expected %d permitted, got %d\n", i, + fprintf(stderr, "%d: expected %u permitted, got %u\n", i, encodedNameConstraints[i].constraints.cPermittedSubtree, constraints->cPermittedSubtree); if (constraints->cPermittedSubtree == @@ -7276,7 +7276,7 @@ static void test_decodeNameConstraints(DWORD dwEncoding) } if (constraints->cExcludedSubtree != encodedNameConstraints[i].constraints.cExcludedSubtree) - fprintf(stderr, "%d: expected %d excluded, got %d\n", i, + fprintf(stderr, "%d: expected %u excluded, got %u\n", i, encodedNameConstraints[i].constraints.cExcludedSubtree, constraints->cExcludedSubtree); if (constraints->cExcludedSubtree ==

1 0

Nikolay Sivov : comctl32/listview: Fix printf format (PVS-Studio).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 7a59b27f4d9160645a85e50af4e5e43047e34d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a59b27f4d9160645a85e50af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 00:27:08 2015 +0300 comctl32/listview: Fix printf format (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a76935a..e479dca 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -587,7 +587,7 @@ static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo) int len, size = DEBUG_BUFFER_SIZE; if (pScrollInfo == NULL) return "(null)"; - len = snprintf(buf, size, "{cbSize=%d, ", pScrollInfo->cbSize); + len = snprintf(buf, size, "{cbSize=%u, ", pScrollInfo->cbSize); if (len == -1) goto end; buf += len; size -= len; if (pScrollInfo->fMask & SIF_RANGE) len = snprintf(buf, size, "nMin=%d, nMax=%d, ", pScrollInfo->nMin, pScrollInfo->nMax);

1 0

Nikolay Sivov : d3dx9_36/tests: Use proper printf format (PVS-Studio).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 67738a41c414a0e9ba15d108f49ed7904f612d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67738a41c414a0e9ba15d108f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 00:27:53 2015 +0300 d3dx9_36/tests: Use proper printf format (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 6 +++--- dlls/d3dx9_36/tests/xfile.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4186e19..3b1fafa 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1487,8 +1487,8 @@ static void check_vertex_buffer_(int line, ID3DXMesh *mesh, const void *vertices return; if (mesh_fvf == fvf) { - DWORD vertex_size = D3DXGetFVFVertexSize(fvf); - int i; + DWORD vertex_size = D3DXGetFVFVertexSize(fvf), i; + for (i = 0; i < min(num_vertices, mesh_num_vertices); i++) { const FLOAT *exp_float = vertices; @@ -2568,7 +2568,7 @@ static void test_polygon(IDirect3DDevice9 *device, float length, unsigned int si mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; - sprintf(name, "polygon (%g, %d)", length, sides); + sprintf(name, "polygon (%g, %u)", length, sides); compare_mesh(name, polygon, &mesh); free_mesh(&mesh); diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 1a56f20..9c722b7 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -343,7 +343,7 @@ static void test_dump(void) goto exit; } - printf("Load templates file (%d bytes)\n", size); + printf("Load templates file (%u bytes)\n", size); ret = D3DXFileCreate(&xfile); ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret);

1 0

Henri Verbeet : wined3d: Add a missing TRACE to wined3d_texture_unmap().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: b0f267ae9dd38acb5f9879389bfe7792ddc9e32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f267ae9dd38acb5f9879389… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 28 14:02:15 2015 +0100 wined3d: Add a missing TRACE to wined3d_texture_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4a518ef..f8ebfff 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1536,9 +1536,11 @@ HRESULT CDECL wined3d_texture_map(struct wined3d_texture *texture, unsigned int HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); - if (!sub_resource) + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) return WINED3DERR_INVALIDCALL; return texture->texture_ops->texture_sub_resource_unmap(sub_resource);

1 0

Henri Verbeet : wined3d: Add a missing TRACE to wined3d_texture_map().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 8cc557a7052006577a1cae4c6bea901bc3cfde04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc557a7052006577a1cae4c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 28 14:02:14 2015 +0100 wined3d: Add a missing TRACE to wined3d_texture_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 057211e..4a518ef 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1523,9 +1523,12 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct HRESULT CDECL wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { - struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); + struct wined3d_resource *sub_resource; - if (!sub_resource) + TRACE("texture %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n", + texture, sub_resource_idx, map_desc, box, flags); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) return WINED3DERR_INVALIDCALL; return texture->texture_ops->texture_sub_resource_map(sub_resource, map_desc, box, flags);

1 0

Riccardo Bortolato : wined3d: Introduce wined3d_texture_release_dc().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 96dd79375601923ab159ce451a049db0fb813b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=96dd79375601923ab159ce451… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 28 14:02:13 2015 +0100 wined3d: Introduce wined3d_texture_release_dc(). 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 +- dlls/wined3d/texture.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 1a2cd54..58d2309 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -311,7 +311,7 @@ static HRESULT WINAPI d3d9_surface_ReleaseDC(IDirect3DSurface9 *iface, HDC dc) TRACE("iface %p, dc %p.\n", iface, dc); wined3d_mutex_lock(); - hr = wined3d_surface_releasedc(surface->wined3d_surface, dc); + hr = wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); wined3d_mutex_unlock(); switch (hr) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ef19ac1..057211e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1558,3 +1558,21 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i return wined3d_surface_getdc(surface_from_resource(sub_resource), dc); } + +HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc) +{ + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u, dc %p.\n", texture, sub_resource_idx, dc); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + return WINED3DERR_INVALIDCALL; + + if (sub_resource->type != WINED3D_RTYPE_SURFACE) + { + WARN("Not supported on %s resources.\n", debug_d3dresourcetype(texture->resource.type)); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_surface_releasedc(surface_from_resource(sub_resource), dc); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8466844..219c190 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -270,6 +270,7 @@ @ cdecl wined3d_texture_get_sub_resource(ptr long) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) +@ cdecl wined3d_texture_release_dc(ptr long ptr) @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8c174e0..9cc1e1c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2553,6 +2553,7 @@ HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); HRESULT __cdecl wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); +HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); HRESULT __cdecl wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id,

1 0

Riccardo Bortolato : wined3d: Introduce wined3d_texture_get_dc().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: a2f2d238d437d34679b9001a49dc2170fc8cee16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f2d238d437d34679b9001a4… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 28 14:02:12 2015 +0100 wined3d: Introduce wined3d_texture_get_dc(). 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 +- dlls/wined3d/texture.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 18fbf21..1a2cd54 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -297,7 +297,7 @@ static HRESULT WINAPI d3d9_surface_GetDC(IDirect3DSurface9 *iface, HDC *dc) } wined3d_mutex_lock(); - hr = wined3d_surface_getdc(surface->wined3d_surface, dc); + hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a6d26ef..ef19ac1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1540,3 +1540,21 @@ HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned in return texture->texture_ops->texture_sub_resource_unmap(sub_resource); } + +HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc) +{ + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u, dc %p.\n", texture, sub_resource_idx, dc); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + return WINED3DERR_INVALIDCALL; + + if (sub_resource->type != WINED3D_RTYPE_SURFACE) + { + WARN("Not supported on %s resources.\n", debug_d3dresourcetype(texture->resource.type)); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_surface_getdc(surface_from_resource(sub_resource), dc); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5b87b18..8466844 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_texture_decref(ptr) @ cdecl wined3d_texture_generate_mipmaps(ptr) @ cdecl wined3d_texture_get_autogen_filter_type(ptr) +@ cdecl wined3d_texture_get_dc(ptr long ptr) @ cdecl wined3d_texture_get_level_count(ptr) @ cdecl wined3d_texture_get_lod(ptr) @ cdecl wined3d_texture_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0f27924..8c174e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2537,6 +2537,7 @@ HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const stru ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture); void __cdecl wined3d_texture_generate_mipmaps(struct wined3d_texture *texture); enum wined3d_texture_filter_type __cdecl wined3d_texture_get_autogen_filter_type(const struct wined3d_texture *texture); +HRESULT __cdecl wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc); DWORD __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture);

1 0

Riccardo Bortolato : d3d8: Use wined3d_rendertarget_view_create_from_sub_resource() in d3d8_surface_get_rendertarget_view().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: c43b290fa52e9f59cd0db95e237d1b28e9883c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43b290fa52e9f59cd0db95e2… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 28 14:02:11 2015 +0100 d3d8: Use wined3d_rendertarget_view_create_from_sub_resource() in d3d8_surface_get_rendertarget_view(). 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/d3d8/surface.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 8153340..317b2a6 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -347,24 +347,13 @@ static const struct wined3d_parent_ops d3d8_view_wined3d_parent_ops = struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) { - struct wined3d_resource *resource; - struct wined3d_resource_desc resource_desc; - struct wined3d_rendertarget_view_desc desc; HRESULT hr; if (surface->wined3d_rtv) return surface->wined3d_rtv; - resource = wined3d_texture_get_resource(surface->wined3d_texture); - wined3d_resource_get_desc(resource, &resource_desc); - - desc.format_id = resource_desc.format; - desc.u.texture.level_idx = surface->sub_resource_idx; - desc.u.texture.layer_idx = 0; - desc.u.texture.layer_count = 1; - - if (FAILED(hr = wined3d_rendertarget_view_create(&desc, resource, - surface, &d3d8_view_wined3d_parent_ops, &surface->wined3d_rtv))) + if (FAILED(hr = wined3d_rendertarget_view_create_from_sub_resource(surface->wined3d_texture, + surface->sub_resource_idx, surface, &d3d8_view_wined3d_parent_ops, &surface->wined3d_rtv))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); return NULL;

1 0

Riccardo Bortolato : wined3d: Introduce wined3d_rendertarget_view_create_from_sub_resource().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 3e491662ba90f97d834dd4cddec1c46b5af49d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e491662ba90f97d834dd4cdd… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 28 14:02:10 2015 +0100 wined3d: Introduce wined3d_rendertarget_view_create_from_sub_resource(). Initial usage in d3d9. 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 | 4 ++-- dlls/wined3d/view.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 23bb43c..18fbf21 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -428,8 +428,8 @@ struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9 if (surface->wined3d_rtv) return surface->wined3d_rtv; - if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(surface->wined3d_surface, - surface, &d3d9_view_wined3d_parent_ops, &surface->wined3d_rtv))) + if (FAILED(hr = wined3d_rendertarget_view_create_from_sub_resource(surface->wined3d_texture, + surface->sub_resource_idx, surface, &d3d9_view_wined3d_parent_ops, &surface->wined3d_rtv))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); return NULL; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 846f7fd..e621356 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -160,6 +160,28 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surfa return wined3d_rendertarget_view_create(&desc, &surface->container->resource, parent, parent_ops, view); } +HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view) +{ + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u, parent %p, parent_ops %p, view %p.\n", + texture, sub_resource_idx, parent, parent_ops, view); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + return WINED3DERR_INVALIDCALL; + + if (sub_resource->type != WINED3D_RTYPE_SURFACE) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(texture->resource.type)); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_rendertarget_view_create_from_surface(surface_from_resource(sub_resource), + parent, parent_ops, view); +} + ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6720350..5b87b18 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -187,6 +187,7 @@ @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_create_from_surface(ptr ptr ptr ptr) +@ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) @ cdecl wined3d_rendertarget_view_get_parent(ptr) @ cdecl wined3d_rendertarget_view_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 82ad493..0f27924 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2430,6 +2430,9 @@ HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarg struct wined3d_rendertarget_view **view); HRESULT __cdecl wined3d_rendertarget_view_create_from_surface(struct wined3d_surface *surface, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view); +HRESULT __cdecl wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view); ULONG __cdecl wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view); void * __cdecl wined3d_rendertarget_view_get_parent(const struct wined3d_rendertarget_view *view); struct wined3d_resource * __cdecl wined3d_rendertarget_view_get_resource(const struct wined3d_rendertarget_view *view);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
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