October 2015 - Wine-commits

Riccardo Bortolato : d3d8: Use wined3d_texture_unmap instead of wined3d_surface_unmap in d3d8_surface_UnlockRect.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 2f1b6114daed8346bd128bdceb34a738aa18e004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1b6114daed8346bd128bdce… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:08 2015 +0200 d3d8: Use wined3d_texture_unmap instead of wined3d_surface_unmap in d3d8_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/d3d8/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 98132ae..75deac3 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -260,7 +260,7 @@ static HRESULT WINAPI d3d8_surface_UnlockRect(IDirect3DSurface8 *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

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

12 Oct '15

Module: wine Branch: master Commit: ea51e1f1073a5bee670a0eed0df70d2eff49e666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea51e1f1073a5bee670a0eed0… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:09 2015 +0200 d3d8: Don't use a wined3d_surface in d3d8_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/d3d8/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 75deac3..165e048 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -176,13 +176,13 @@ static HRESULT WINAPI d3d8_surface_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_ { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(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_map in d3d9_surface_LockRect.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: df1101ff6820059c3a4298d6e7f901733b7c9636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df1101ff6820059c3a4298d6e… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:10 2015 +0200 d3d9: Make use of wined3d_texture_map in d3d9_surface_LockRect. Also store wined3d_texture and sub_resource_idx in d3d9_surface. 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/d3d9_private.h | 4 +++- dlls/d3d9/device.c | 2 +- dlls/d3d9/surface.c | 11 +++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index ea0d3e6..dc9ae1c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -214,6 +214,8 @@ struct d3d9_surface { IDirect3DSurface9 IDirect3DSurface9_iface; struct d3d9_resource resource; + struct wined3d_texture *wined3d_texture; + unsigned int sub_resource_idx; struct wined3d_surface *wined3d_surface; struct list rtv_entry; struct wined3d_rendertarget_view *wined3d_rtv; @@ -224,7 +226,7 @@ struct d3d9_surface }; struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; -void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, +void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5df36f3..f49664e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3545,7 +3545,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) return E_OUTOFMEMORY; - surface_init(d3d_surface, wined3d_texture_get_parent(wined3d_texture), surface, parent_ops); + surface_init(d3d_surface, wined3d_texture, sub_resource_idx, surface, parent_ops); *parent = d3d_surface; TRACE("Created surface %p.\n", d3d_surface); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 7dc6e70..ec5b420 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -251,7 +251,8 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, } wined3d_mutex_lock(); - hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect ? &box : NULL, flags); + hr = wined3d_texture_map(surface->wined3d_texture, surface->sub_resource_idx, + &map_desc, rect ? &box : NULL, flags); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -356,7 +357,7 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, +void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { struct wined3d_resource_desc desc; @@ -367,9 +368,11 @@ void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, surface->resource.refcount = 0; surface->wined3d_surface = wined3d_surface; list_init(&surface->rtv_entry); - surface->container = container_parent; + surface->container = wined3d_texture_get_parent(wined3d_texture); + surface->wined3d_texture = wined3d_texture; + surface->sub_resource_idx = sub_resource_idx; - if (container_parent && SUCCEEDED(IUnknown_QueryInterface(container_parent, + if (surface->container && SUCCEEDED(IUnknown_QueryInterface(surface->container, &IID_IDirect3DBaseTexture9, (void **)&texture))) { surface->texture = unsafe_impl_from_IDirect3DBaseTexture9(texture);

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

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

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

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

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

Sebastian Lackner : gdiplus: Do not use GdipAlloc and GdipFree in internal functions.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: aa70a90c6ef8c746b868990d0cd11ca013beef58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa70a90c6ef8c746b868990d0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 5 00:22:34 2015 +0200 gdiplus: Do not use GdipAlloc and GdipFree in internal functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 158 ++++++++++++++++++++-------------------- dlls/gdiplus/customlinecap.c | 30 ++++---- dlls/gdiplus/font.c | 26 +++---- dlls/gdiplus/gdiplus.c | 10 +-- dlls/gdiplus/gdiplus_private.h | 11 +++ dlls/gdiplus/graphics.c | 160 ++++++++++++++++++++--------------------- dlls/gdiplus/graphicspath.c | 132 +++++++++++++++++----------------- dlls/gdiplus/image.c | 126 ++++++++++++++++---------------- dlls/gdiplus/imageattributes.c | 12 ++-- dlls/gdiplus/matrix.c | 18 ++--- dlls/gdiplus/metafile.c | 26 +++---- dlls/gdiplus/pathiterator.c | 12 ++-- dlls/gdiplus/pen.c | 18 ++--- dlls/gdiplus/region.c | 68 +++++++++--------- dlls/gdiplus/stringformat.c | 26 +++---- 15 files changed, 422 insertions(+), 411 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa70a90c6ef8c746b8689…

1 0

Alistair Leslie-Hughes : include: Add gdipluseffects.h.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 447ee4cf46093242088034330bccc43a43379691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447ee4cf46093242088034330… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:07:49 2015 +1100 include: Add gdipluseffects.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/gdiplus.h | 2 ++ include/gdipluseffects.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3d2c97f..c5563a2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -345,6 +345,7 @@ SRCDIR_INCLUDES = \ gdiplus.h \ gdipluscolor.h \ gdipluscolormatrix.h \ + gdipluseffects.h \ gdiplusenums.h \ gdiplusflat.h \ gdiplusgpstubs.h \ diff --git a/include/gdiplus.h b/include/gdiplus.h index f063b3e..e85343b 100644 --- a/include/gdiplus.h +++ b/include/gdiplus.h @@ -37,6 +37,7 @@ namespace Gdiplus #include "gdipluscolor.h" #include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" +#include "gdipluseffects.h" namespace DllExports { @@ -57,6 +58,7 @@ namespace Gdiplus #include "gdipluscolor.h" #include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" +#include "gdipluseffects.h" #include "gdiplusflat.h" diff --git a/include/gdipluseffects.h b/include/gdipluseffects.h new file mode 100644 index 0000000..d2d6a05 --- /dev/null +++ b/include/gdipluseffects.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2015 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _GDIPLUSEFFECTS_H +#define _GDIPLUSEFFECTS_H + +DEFINE_GUID(BlurEffectGuid, 0x633c80a4, 0x1843, 0x482b, 0x9e, 0xf2, 0xbe, 0x28, 0x34, 0xc5, 0xfd, 0xd4); +DEFINE_GUID(SharpenEffectGuid, 0x63cbf3ee, 0xc526, 0x402c, 0x8f, 0x71, 0x62, 0xc5, 0x40, 0xbf, 0x51, 0x42); +DEFINE_GUID(ColorMatrixEffectGuid, 0x718f2615, 0x7933, 0x40e3, 0xa5, 0x11, 0x5f, 0x68, 0xfe, 0x14, 0xdd, 0x74); +DEFINE_GUID(ColorLUTEffectGuid, 0xa7ce72a9, 0x0f7f, 0x40d7, 0xb3, 0xcc, 0xd0, 0xc0, 0x2d, 0x5c, 0x32, 0x12); +DEFINE_GUID(BrightnessContrastEffectGuid, 0xd3a1dbe1, 0x8ec4, 0x4c17, 0x9f, 0x4c, 0xea, 0x97, 0xad, 0x1c, 0x34, 0x3d); +DEFINE_GUID(HueSaturationLightnessEffectGuid, 0x8b2dd6c3, 0xeb07, 0x4d87, 0xa5, 0xf0, 0x71, 0x08, 0xe2, 0x6a, 0x9c, 0x5f); +DEFINE_GUID(LevelsEffectGuid, 0x99c354ec, 0x2a31, 0x4f3a, 0x8c, 0x34, 0x17, 0xa8, 0x03, 0xb3, 0x3a, 0x25); +DEFINE_GUID(TintEffectGuid, 0x1077af00, 0x2848, 0x4441, 0x94, 0x89, 0x44, 0xad, 0x4c, 0x2d, 0x7a, 0x2c); +DEFINE_GUID(ColorBalanceEffectGuid, 0x537e597d, 0x251e, 0x48da, 0x96, 0x64, 0x29, 0xca, 0x49, 0x6b, 0x70, 0xf8); +DEFINE_GUID(RedEyeCorrectionEffectGuid, 0x74d29d05, 0x69a4, 0x4266, 0x95, 0x49, 0x3c, 0xc5, 0x28, 0x36, 0xb6, 0x32); +DEFINE_GUID(ColorCurveEffectGuid, 0xdd6a0022, 0x58e4, 0x4a67, 0x9d, 0x9b, 0xd4, 0x8e, 0xb8, 0x81, 0xa5, 0x3d); + +#ifdef __cplusplus +extern "C" { +#endif + +GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect); +GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect); + +#ifdef __cplusplus +} +#endif + +#endif

1 0