March 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : scrrun: Fix a find handle leak (Coverity).
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: c3f5fc58bdf5c4280d434860ce3821916cf50957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f5fc58bdf5c4280d434860c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 25 08:00:56 2014 +0400 scrrun: Fix a find handle leak (Coverity). --- dlls/scrrun/filesystem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f4c1997..33344e4 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3335,10 +3335,9 @@ static HRESULT copy_folder(const WCHAR *source, DWORD source_len, const WCHAR *d FindClose(f); return CTL_E_FILEALREADYEXISTS; } - }else { - FindClose(f); - return create_error(GetLastError()); } + + FindClose(f); return create_error(GetLastError()); } copied = TRUE;

1 0

Vincent Povirk : gdiplus: Limit image output to the bounds of the Graphics object.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 526143cb05ade443113107b6b98bb84ef678b7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526143cb05ade443113107b6b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 13 16:28:50 2014 -0500 gdiplus: Limit image output to the bounds of the Graphics object. --- dlls/gdiplus/graphics.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e3bf98e..8f0ea8c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2858,6 +2858,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (use_software) { RECT dst_area; + GpRectF graphics_bounds; GpRect src_area; int i, x, y, src_stride, dst_stride; GpMatrix dst_to_src; @@ -2883,8 +2884,18 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (dst_area.bottom < pti[i].y) dst_area.bottom = pti[i].y; } + stat = get_graphics_bounds(graphics, &graphics_bounds); + if (stat != Ok) return stat; + + if (graphics_bounds.X > dst_area.left) dst_area.left = floorf(graphics_bounds.X); + if (graphics_bounds.Y > dst_area.top) dst_area.top = floorf(graphics_bounds.Y); + if (graphics_bounds.X + graphics_bounds.Width < dst_area.right) dst_area.right = ceilf(graphics_bounds.X + graphics_bounds.Width); + if (graphics_bounds.Y + graphics_bounds.Height < dst_area.bottom) dst_area.bottom = ceilf(graphics_bounds.Y + graphics_bounds.Height); + TRACE("dst_area: %s\n", wine_dbgstr_rect(&dst_area)); + if (IsRectEmpty(&dst_area)) return Ok; + m11 = (ptf[1].X - ptf[0].X) / srcwidth; m21 = (ptf[2].X - ptf[0].X) / srcheight; mdx = ptf[0].X - m11 * srcx - m21 * srcy;

1 0

Ken Thomases : wined3d: Don' t leak the HDC of an invalid context in context_update_window().
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 03ca2b2932b38e0b79592787e32013c1e5ae66bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ca2b2932b38e0b79592787e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:45:44 2014 -0500 wined3d: Don't leak the HDC of an invalid context in context_update_window(). If context_set_gl_context() fails, it marks the context as invalid. It still has an HDC, though, and context_update_window() would lose the reference to it. --- dlls/wined3d/context.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 56673c7..73e2c39 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -884,13 +884,12 @@ static void context_update_window(struct wined3d_context *context) TRACE("Updating context %p window from %p to %p.\n", context, context->win_handle, context->swapchain->win_handle); - if (context->valid) + if (context->hdc) wined3d_release_dc(context->win_handle, context->hdc); - else - context->valid = 1; context->win_handle = context->swapchain->win_handle; context->needs_set = 1; + context->valid = 1; if (!(context->hdc = GetDC(context->win_handle))) {

1 0

Stefan Dösinger : d3d9: Use the private store api for surfaces.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 50de4cda8ff6742ff18221ecd6d30dcecb3de7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=50de4cda8ff6742ff18221ecd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:17 2014 +0100 d3d9: Use the private store api for surfaces. --- dlls/d3d9/surface.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 0595039..bf8b41a 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -143,52 +143,28 @@ static HRESULT WINAPI d3d9_surface_SetPrivateData(IDirect3DSurface9 *iface, REFG const void *data, DWORD data_size, DWORD flags) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&surface->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_surface_GetPrivateData(IDirect3DSurface9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&surface->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_surface_FreePrivateData(IDirect3DSurface9 *iface, REFGUID guid) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&surface->resource, guid); } static DWORD WINAPI d3d9_surface_SetPriority(IDirect3DSurface9 *iface, DWORD priority)

1 0

Ken Thomases : wined3d: Track if a context' s private hdc has had its pixel format set, so we don't need to check it.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: f3aa4812382caa459b9b612f66998c6ea8257594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3aa4812382caa459b9b612f6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:46:25 2014 -0500 wined3d: Track if a context's private hdc has had its pixel format set, so we don't need to check it. --- dlls/wined3d/context.c | 22 +++++++++++++++++----- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 34c0637..00ab25f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -753,9 +753,13 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BOOL private, int format) { const struct wined3d_gl_info *gl_info = context->gl_info; - int current = GetPixelFormat(dc); + int current; - if (current == format) return TRUE; + if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format) + return TRUE; + + current = GetPixelFormat(dc); + if (current == format) goto success; if (!current) { @@ -769,7 +773,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO context->restore_pf = 0; context->restore_pf_win = private ? NULL : WindowFromDC(dc); - return TRUE; + goto success; } /* By default WGL doesn't allow pixel format adjustments but we need it @@ -796,7 +800,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO context->restore_pf_win = win; } - return TRUE; + goto success; } /* OpenGL doesn't allow pixel format adjustments. Print an error and @@ -806,6 +810,11 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", format, dc, current); return TRUE; + +success: + if (dc == context->hdc && context->hdc_is_private) + context->hdc_has_format = TRUE; + return TRUE; } static BOOL context_set_gl_context(struct wined3d_context *ctx) @@ -891,6 +900,7 @@ static void context_update_window(struct wined3d_context *context) context->win_handle = context->swapchain->win_handle; context->hdc_is_private = FALSE; + context->hdc_has_format = FALSE; context->needs_set = 1; context->valid = 1; @@ -1120,7 +1130,8 @@ static void context_enter(struct wined3d_context *context) context->restore_dc = wglGetCurrentDC(); context->needs_set = 1; } - else if (!context->needs_set && context->pixel_format != GetPixelFormat(context->hdc)) + else if (!context->needs_set && !(context->hdc_is_private && context->hdc_has_format) + && context->pixel_format != GetPixelFormat(context->hdc)) context->needs_set = 1; } } @@ -1521,6 +1532,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->win_handle = swapchain->win_handle; ret->hdc = hdc; ret->hdc_is_private = hdc_is_private; + ret->hdc_has_format = TRUE; ret->pixel_format = pixel_format; ret->needs_set = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69630b1..7abcc8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1087,7 +1087,8 @@ struct wined3d_context DWORD rebind_fbo : 1; DWORD needs_set : 1; DWORD hdc_is_private : 1; - DWORD padding : 17; + DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ + DWORD padding : 16; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Ken Thomases : wined3d: Don't call GetPixelFormat() to set a flag that' s already set.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: ffb357b717680b52917f280b3716da7b387f4af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb357b717680b52917f280b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:45:54 2014 -0500 wined3d: Don't call GetPixelFormat() to set a flag that's already set. --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f90557e..3341ae2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1116,7 +1116,7 @@ static void context_enter(struct wined3d_context *context) context->restore_dc = wglGetCurrentDC(); context->needs_set = 1; } - else if (context->pixel_format != GetPixelFormat(context->hdc)) + else if (!context->needs_set && context->pixel_format != GetPixelFormat(context->hdc)) context->needs_set = 1; } }

1 0

Nikolay Sivov : oleaut32/tests: Move string allocation after function pointer check (Coverity).
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: e5e86776664a19aeb009fb27f5fe6efcf04494ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e86776664a19aeb009fb27f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 24 20:01:50 2014 +0400 oleaut32/tests: Move string allocation after function pointer check (Coverity). --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d28b5c1..bfbc0b2 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6000,11 +6000,11 @@ static void test_VarAnd(void) VARTYPE i; HRESULT hres; + CHECKPTR(VarAnd); + true_str = SysAllocString(szTrue); false_str = SysAllocString(szFalse); - CHECKPTR(VarAnd); - /* Test all possible flag/vt combinations & the resulting vt type */ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { @@ -7479,11 +7479,11 @@ static void test_VarDiv(void) HRESULT hres; double r; + CHECKPTR(VarDiv); + num1_str = SysAllocString(str1); num2_str = SysAllocString(str2); - CHECKPTR(VarDiv); - /* Test all possible flag/vt combinations & the resulting vt type */ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) {

1 0

Stefan Dösinger : d3d9: Use the private store api for textures.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 6121393d0a286b8c4dbc3f0ac5fea3b2e9d6df5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6121393d0a286b8c4dbc3f0ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:16 2014 +0100 d3d9: Use the private store api for textures. --- dlls/d3d9/texture.c | 90 ++++++--------------------------------------------- 1 file changed, 9 insertions(+), 81 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 47ccb30..3c2107a 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -115,52 +115,28 @@ static HRESULT WINAPI d3d9_texture_2d_SetPrivateData(IDirect3DTexture9 *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_texture_2d_GetPrivateData(IDirect3DTexture9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_texture_2d_FreePrivateData(IDirect3DTexture9 *iface, REFGUID guid) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d9_texture_2d_SetPriority(IDirect3DTexture9 *iface, DWORD priority) @@ -528,52 +504,28 @@ static HRESULT WINAPI d3d9_texture_cube_SetPrivateData(IDirect3DCubeTexture9 *if REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_texture_cube_GetPrivateData(IDirect3DCubeTexture9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_texture_cube_FreePrivateData(IDirect3DCubeTexture9 *iface, REFGUID guid) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d9_texture_cube_SetPriority(IDirect3DCubeTexture9 *iface, DWORD priority) @@ -965,52 +917,28 @@ static HRESULT WINAPI d3d9_texture_3d_SetPrivateData(IDirect3DVolumeTexture9 *if REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_texture_3d_GetPrivateData(IDirect3DVolumeTexture9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_texture_3d_FreePrivateData(IDirect3DVolumeTexture9 *iface, REFGUID guid) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d9_texture_3d_SetPriority(IDirect3DVolumeTexture9 *iface, DWORD priority)

1 0

Ken Thomases : wined3d: Simplify the error path of context_update_window() .
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 90d7f3e03f584f15f94fa7c75b51342f725d2f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d7f3e03f584f15f94fa7c75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:45:50 2014 -0500 wined3d: Simplify the error path of context_update_window(). --- dlls/wined3d/context.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 73e2c39..f90557e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -894,13 +894,8 @@ static void context_update_window(struct wined3d_context *context) if (!(context->hdc = GetDC(context->win_handle))) { ERR("Failed to get a device context for window %p.\n", context->win_handle); - goto err; + context->valid = 0; } - - return; - -err: - context->valid = 0; } static void context_destroy_gl_resources(struct wined3d_context *context)

1 0

Stefan Dösinger : wined3d: Remove resource private data methods.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: ebd5f96aea22f4093d4ceb109bdead2657666c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd5f96aea22f4093d4ceb109… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:18 2014 +0100 wined3d: Remove resource private data methods. --- dlls/d3d9/volume.c | 30 +++------------------ dlls/wined3d/resource.c | 58 ---------------------------------------- dlls/wined3d/wined3d.spec | 3 --- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 5 ---- 5 files changed, 3 insertions(+), 94 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index a546c06..30a977c 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -123,52 +123,28 @@ static HRESULT WINAPI d3d9_volume_SetPrivateData(IDirect3DVolume9 *iface, REFGUI const void *data, DWORD data_size, DWORD flags) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_volume_get_resource(volume->wined3d_volume); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&volume->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_volume_GetPrivateData(IDirect3DVolume9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_volume_get_resource(volume->wined3d_volume); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&volume->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_volume_FreePrivateData(IDirect3DVolume9 *iface, REFGUID guid) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_volume_get_resource(volume->wined3d_volume); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&volume->resource, guid); } static HRESULT WINAPI d3d9_volume_GetContainer(IDirect3DVolume9 *iface, REFIID riid, void **container) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 43bd7ce..999dc5c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -100,7 +100,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->parent = parent; resource->parent_ops = parent_ops; resource->resource_ops = resource_ops; - wined3d_private_store_init(&resource->private_store); if (size) { @@ -144,8 +143,6 @@ void resource_cleanup(struct wined3d_resource *resource) adapter_adjust_memory(resource->device->adapter, 0 - resource->size); } - wined3d_private_store_cleanup(&resource->private_store); - wined3d_resource_free_sysmem(resource); device_resource_released(resource->device, resource); @@ -160,61 +157,6 @@ void resource_unload(struct wined3d_resource *resource) resource, resource->type); } -HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resource, REFGUID guid, - const void *data, DWORD data_size, DWORD flags) -{ - TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", - resource, debugstr_guid(guid), data, data_size, flags); - - return wined3d_private_store_set_private_data(&resource->private_store, guid, data, data_size, flags); -} - -HRESULT CDECL wined3d_resource_get_private_data(const struct wined3d_resource *resource, REFGUID guid, - void *data, DWORD *data_size) -{ - const struct wined3d_private_data *d; - DWORD size_in; - - TRACE("resource %p, guid %s, data %p, data_size %p.\n", - resource, debugstr_guid(guid), data, data_size); - - d = wined3d_private_store_get_private_data(&resource->private_store, guid); - if (!d) - return WINED3DERR_NOTFOUND; - - size_in = *data_size; - *data_size = d->size; - if (!data) - return WINED3D_OK; - if (size_in < d->size) - return WINED3DERR_MOREDATA; - - if (d->flags & WINED3DSPD_IUNKNOWN) - { - *(IUnknown **)data = d->content.object; - IUnknown_AddRef(d->content.object); - } - else - { - memcpy(data, d->content.data, d->size); - } - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_resource_free_private_data(struct wined3d_resource *resource, REFGUID guid) -{ - struct wined3d_private_data *entry; - TRACE("resource %p, guid %s.\n", resource, debugstr_guid(guid)); - - entry = wined3d_private_store_get_private_data(&resource->private_store, guid); - if (!entry) - return WINED3DERR_NOTFOUND; - wined3d_private_store_free_private_data(&resource->private_store, entry); - - return WINED3D_OK; -} - DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) { DWORD prev = resource->priority; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3243f77..bdfe017 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -170,12 +170,9 @@ @ cdecl wined3d_query_incref(ptr) @ cdecl wined3d_query_issue(ptr long) -@ cdecl wined3d_resource_free_private_data(ptr ptr) @ cdecl wined3d_resource_get_desc(ptr ptr) @ cdecl wined3d_resource_get_parent(ptr) -@ cdecl wined3d_resource_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_resource_set_parent(ptr ptr) -@ cdecl wined3d_resource_set_private_data(ptr ptr ptr long long) @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7abcc8a..9e209d9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2008,7 +2008,6 @@ struct wined3d_resource DWORD priority; void *heap_memory; struct list resource_list_entry; - struct wined3d_private_store private_store; void *parent; const struct wined3d_parent_ops *parent_ops; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e6fa2d1..c958872 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2340,15 +2340,10 @@ static inline HRESULT wined3d_private_store_set_private_data(struct wined3d_priv return WINED3D_OK; } -HRESULT __cdecl wined3d_resource_free_private_data(struct wined3d_resource *resource, REFGUID guid); void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc); void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource); -HRESULT __cdecl wined3d_resource_get_private_data(const struct wined3d_resource *resource, - REFGUID guid, void *data, DWORD *data_size); void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); -HRESULT __cdecl wined3d_resource_set_private_data(struct wined3d_resource *resource, - REFGUID guid, const void *data, DWORD data_size, DWORD flags); HRESULT __cdecl wined3d_rendertarget_view_create(struct wined3d_resource *resource, void *parent, struct wined3d_rendertarget_view **rendertarget_view);

1 0