July 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: RENDERTARGET | AUTOGENMIPMAP are compatible.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: c4eae160d7f8207803c4e6f5d3ea787e791dc95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4eae160d7f8207803c4e6f5d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 1 10:10:28 2008 -0500 wined3d: RENDERTARGET | AUTOGENMIPMAP are compatible. The test used D3DPOOL_MANAGED which is mutually exclusive with RENDERTARGET usage, thus the call failed. --- dlls/d3d9/tests/texture.c | 12 ++++++------ dlls/wined3d/device.c | 14 +------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 056d80f..bbc98a7 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -136,9 +136,9 @@ static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device_ptr) /* testing shows that autogenmipmap and rendertarget are mutually exclusive options */ hr = IDirect3DDevice9_CreateCubeTexture(device_ptr, 64, 0, (D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP), D3DFMT_X8R8G8B8, - D3DPOOL_MANAGED, &texture_ptr, 0); - ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", - hr, D3DERR_INVALIDCALL); + D3DPOOL_DEFAULT, &texture_ptr, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", + hr, D3D_OK); if (texture_ptr) IDirect3DCubeTexture9_Release(texture_ptr); texture_ptr = NULL; @@ -185,9 +185,9 @@ static void test_mipmap_gen(IDirect3DDevice9 *device) /* testing shows that autogenmipmap and rendertarget are mutually exclusive options */ hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, (D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP), D3DFMT_X8R8G8B8, - D3DPOOL_MANAGED, &texture, 0); - ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", - hr, D3DERR_INVALIDCALL); + D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", + hr, D3D_OK); if (texture) IDirect3DTexture9_Release(texture); texture = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 45dc25c..416e828 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -772,13 +772,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U TRACE("Format %#x (%s), Pool %#x, ppTexture %p, pSharedHandle %p, parent %p\n", Format, debug_d3dformat(Format), Pool, ppTexture, pSharedHandle, parent); - if((Usage & (WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_RENDERTARGET)) == - (WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_RENDERTARGET)) { - WARN("Application requests both D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET, which are mutually exclusive\n"); - return WINED3DERR_INVALIDCALL; - } - - /* TODO: It should only be possible to create textures for formats + /* TODO: It should only be possible to create textures for formats that are reported as supported */ if (WINED3DFMT_UNKNOWN >= Format) { WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN\n", This); @@ -1060,12 +1054,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface const GlPixelFormatDesc *glDesc; getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc); - if((Usage & (WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_RENDERTARGET)) == - (WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_RENDERTARGET)) { - WARN("Application requests both D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET, which are mutually exclusive\n"); - return WINED3DERR_INVALIDCALL; - } - /* TODO: It should only be possible to create textures for formats that are reported as supported */ if (WINED3DFMT_UNKNOWN >= Format) {

1 0

Stefan Dösinger : wined3d: Update the blit ortho on size changes.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 74c5684f903cdf84607bb67bf8c739bffc8df5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5684f903cdf84607bb67bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 17 01:41:49 2008 +0200 wined3d: Update the blit ortho on size changes. SetupForBlit sets up the GL viewport and projection matrix for screen-cordinate access to the framebuffer. These settings were not updated if the other gl states were already set up for blitting. Guild Wars reads back an offscreen rendered texture from the framebuffer, which currently sets up CTXUSAGE_BLIT, then changes the render target, and draws to the texture, which has to be reloaded from system memory before it can be rendered to(since GW loaded some data into it). If the two render targets had different size this failed. --- dlls/wined3d/context.c | 33 +++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 382f96d..fb7bb3f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -610,6 +610,17 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { RemoveContextFromArray(This, context); } +static inline void set_blit_dimension(UINT width, UINT height) { + glMatrixMode(GL_PROJECTION); + checkGLcall("glMatrixMode(GL_PROJECTION)"); + glLoadIdentity(); + checkGLcall("glLoadIdentity()"); + glOrtho(0, width, height, 0, 0.0, -1.0); + checkGLcall("glOrtho"); + glViewport(0, 0, width, height); + checkGLcall("glViewport"); +} + /***************************************************************************** * SetupForBlit * @@ -634,6 +645,14 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex TRACE("Setting up context %p for blitting\n", context); if(context->last_was_blit) { + if(context->blit_w != width || context->blit_h != height) { + set_blit_dimension(width, height); + context->blit_w = width; context->blit_h = height; + /* No need to dirtify here, the states are still dirtified because they weren't + * applied since the last SetupForBlit call. Otherwise last_was_blit would not + * be set + */ + } TRACE("Context is already set up for blitting, nothing to do\n"); return; } @@ -756,14 +775,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex checkGLcall("glLoadIdentity()"); Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)), StateTable); - glMatrixMode(GL_PROJECTION); - checkGLcall("glMatrixMode(GL_PROJECTION)"); - glLoadIdentity(); - checkGLcall("glLoadIdentity()"); - glOrtho(0, width, height, 0, 0.0, -1.0); - checkGLcall("glOrtho"); - Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); - context->last_was_rhw = TRUE; Context_MarkStateDirty(context, STATE_VDECL, StateTable); /* because of last_was_rhw = TRUE */ @@ -775,9 +786,11 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPING), StateTable); - glViewport(0, 0, width, height); - checkGLcall("glViewport"); + set_blit_dimension(width, height); + context->blit_w = width; context->blit_h = height; Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); + Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, FALSE); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 880f93d..ae36ad1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -616,6 +616,7 @@ struct WineD3DContext { unsigned char num_untracked_materials; GLenum untracked_materials[2]; BOOL last_was_blit, last_was_ckey; + UINT blit_w, blit_h; char texShaderBumpMap; BOOL fog_coord;

1 0

Stefan Dösinger : wined3d: Use CTXUSAGE_RESOURCELOAD for fb->texture reads.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 1c7f39ed1e4a03aac2dd434ea88892234899c4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7f39ed1e4a03aac2dd434ea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 17 01:41:02 2008 +0200 wined3d: Use CTXUSAGE_RESOURCELOAD for fb->texture reads. There is no need for _BLIT usage. RESOURCELOAD should be faster. --- dlls/wined3d/surface.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0171e31..1db152e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -886,12 +886,11 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); IWineD3DSurface_GetContainer((IWineD3DSurface *) This, &IID_IWineD3DSwapChain, (void **)&swapchain); - /* Activate the surface. Set it up for blitting now, although not necessarily needed for LockRect. - * Certain graphics drivers seem to dislike some enabled states when reading from opengl, the blitting usage - * should help here. Furthermore unlockrect will need the context set up for blitting. The context manager will find - * context->last_was_blit set on the unlock. + /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer + * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any + * states in the stateblock, and no driver was found yet that had bugs in that regard. */ - ActivateContext(device, (IWineD3DSurface *) This, CTXUSAGE_BLIT); + ActivateContext(device, (IWineD3DSurface *) This, CTXUSAGE_RESOURCELOAD); surface_bind_and_dirtify(This); ENTER_GL();

1 0

Stefan Dösinger : wined3d: Delay render target activation.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 2d4d18b59dc26b8aee04553671b942071d9213b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4d18b59dc26b8aee0455367… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 17 01:42:55 2008 +0200 wined3d: Delay render target activation. The ActivateContext in SetRenderTarget was an old regression prevention, but now it is time to remove it. --- dlls/wined3d/device.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 416e828..7754e50 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6724,13 +6724,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, * SetViewport may catch NOP viewport changes, which would occur when switching between equally sized targets */ IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); - - /* Activate the new render target for now. This shouldn't stay here, but is needed until all methods using gl activate the - * ctx properly. - * Use resourceload usage, this will just set the drawables and context but not apply any states. The stateblock may be - * incomplete or incorrect when SetRenderTarget is called. DrawPrim() will apply the states when it is called. - */ - ActivateContext(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); } return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Restore the gamma when destroying the swapchain.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 8d930f6009bbdd45f62ed550b7aa67be77b36379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d930f6009bbdd45f62ed550b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 1 11:17:38 2008 -0500 wined3d: Restore the gamma when destroying the swapchain. --- dlls/wined3d/device.c | 2 ++ dlls/wined3d/swapchain.c | 4 ++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7754e50..d7e157d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1599,6 +1599,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic object->wantsDepthStencilBuffer = FALSE; } + IWineD3DSwapChain_GetGammaRamp((IWineD3DSwapChain *) object, &object->orig_gamma); + TRACE("Created swapchain %p\n", object); TRACE("FrontBuf @ %p, BackBuf @ %p, DepthStencil %d\n",object->frontBuffer, object->backBuffer ? object->backBuffer[0] : NULL, object->wantsDepthStencilBuffer); return WINED3D_OK; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5cc1c59..e564a81 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -88,6 +88,10 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB WINED3DDISPLAYMODE mode; int i; + TRACE("Destroying swapchain %p\n", iface); + + IWineD3DSwapChain_SetGammaRamp(iface, 0, &This->orig_gamma); + /* release the ref to the front and back buffer parents */ if(This->frontBuffer) { IWineD3DSurface_SetContainer(This->frontBuffer, 0); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae36ad1..83955b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1698,6 +1698,7 @@ typedef struct IWineD3DSwapChainImpl WINED3DPRESENT_PARAMETERS presentParms; DWORD orig_width, orig_height; WINED3DFORMAT orig_fmt; + WINED3DGAMMARAMP orig_gamma; long prev_time, frames; /* Performance tracking */ unsigned int vSyncCounter;

1 0

Alexander Dorofeyev : quartz: Fix memleak in FilterMapper2_RegisterFilter.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: c206f9103085438e54112447d2fb86cf06df2dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c206f9103085438e54112447d… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Jul 2 00:59:21 2008 +0300 quartz: Fix memleak in FilterMapper2_RegisterFilter. --- dlls/quartz/filtermapper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 3a84b7d..925d709 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -855,6 +855,7 @@ static HRESULT WINAPI FilterMapper2_RegisterFilter( if (pPropBag) IPropertyBag_Release(pPropBag); CoTaskMemFree(szClsidTemp); + CoTaskMemFree(pwszParseName); if (SUCCEEDED(hr) && ppMoniker) *ppMoniker = pMoniker;

1 0

Alexander Dorofeyev : quartz: Fix memory leak in FilterMapper_RegisterFilter.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: bbd22ae06c694bb02d85f43b3f7bc5d1f06bc2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd22ae06c694bb02d85f43b3… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Jul 2 00:59:27 2008 +0300 quartz: Fix memory leak in FilterMapper_RegisterFilter. --- dlls/quartz/filtermapper.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 925d709..4977924 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1356,6 +1356,8 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c CloseHandle(hKey); } + CoTaskMemFree(wszClsid); + return hr; }

1 0

Alexander Dorofeyev : quartz: Fix memory leak and behavior on errors in FilterMapper_EnumMatchingFilters .
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: b312d42059cb5d139146b9902347c02dd1d8c1ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b312d42059cb5d139146b9902… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Jul 2 00:59:33 2008 +0300 quartz: Fix memory leak and behavior on errors in FilterMapper_EnumMatchingFilters. --- dlls/quartz/filtermapper.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 4977924..aa92cc8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1210,6 +1210,8 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( OutputType[0] = clsOutMaj; OutputType[1] = clsOutSub; + *ppEnum = NULL; + hr = IFilterMapper2_EnumMatchingFilters((IFilterMapper2*)This, &ppEnumMoniker, 0, @@ -1236,7 +1238,6 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( nb_mon++; } - *ppEnum = NULL; if (!nb_mon) { IEnumMoniker_Release(ppEnumMoniker); @@ -1249,6 +1250,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( IEnumMoniker_Release(ppEnumMoniker); return E_OUTOFMEMORY; } + ZeroMemory(regfilters, nb_mon * sizeof(REGFILTER)); /* will prevent bad free of Name in case of error. */ IEnumMoniker_Reset(ppEnumMoniker); while(IEnumMoniker_Next(ppEnumMoniker, 1, &IMon, &nb) == S_OK) @@ -1281,7 +1283,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( hr = E_OUTOFMEMORY; } - if (SUCCEEDED(hrSub)) + if (SUCCEEDED(hrSub) && regfilters[idx].Name) { memcpy(regfilters[idx].Name, V_UNION(&var, bstrVal), len); regfilters[idx].Clsid = clsid; @@ -1294,17 +1296,13 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( VariantClear(&var); } - /* In case of release all resources */ - if (!SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { - for (idx = 0; idx < nb_mon; idx++) - CoTaskMemFree(regfilters[idx].Name); - CoTaskMemFree(regfilters); - IEnumMoniker_Release(ppEnumMoniker); - return hr; + hr = IEnumRegFiltersImpl_Construct(regfilters, nb_mon, ppEnum); } - hr = IEnumRegFiltersImpl_Construct(regfilters, nb_mon, ppEnum); + for (idx = 0; idx < nb_mon; idx++) + CoTaskMemFree(regfilters[idx].Name); CoTaskMemFree(regfilters); IEnumMoniker_Release(ppEnumMoniker);

1 0

Adam Petaccia : gdiplus: Correct spec entry for GdipFlush.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 9f65b9a0fc9d3db681e70868377a8e8bf5dc6ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f65b9a0fc9d3db681e708683… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 1 20:46:31 2008 -0400 gdiplus: Correct spec entry for GdipFlush. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 61cc2de..587f2ab 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -234,7 +234,7 @@ @ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem @ stub GdipFlattenPath -@ stdcall GdipFlush(long) +@ stdcall GdipFlush(ptr long) @ stdcall GdipFree(ptr) @ stub GdipGetAdjustableArrowCapFillState @ stub GdipGetAdjustableArrowCapHeight

1 0

Adam Petaccia : gdiplus: Stub GdipCloneImage.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: af29f96939cb204d355a5d03f928d3f1a673f785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af29f96939cb204d355a5d03f… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 1 21:03:34 2008 -0400 gdiplus: Stub GdipCloneImage. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 9 +++++++++ include/gdiplusflat.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 587f2ab..4067873 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -52,7 +52,7 @@ @ stdcall GdipCloneCustomLineCap(ptr ptr) @ stdcall GdipCloneFont(ptr ptr) @ stub GdipCloneFontFamily -@ stub GdipCloneImage +@ stdcall GdipCloneImage(ptr ptr) @ stdcall GdipCloneImageAttributes(ptr ptr) @ stdcall GdipCloneMatrix(ptr ptr) @ stdcall GdipClonePath(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 330e54b..bf2ac35 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -240,6 +240,15 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } +GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) +{ + if (!(image && cloneImage)) return InvalidParameter; + + FIXME("stub: %p, %p", image, cloneImage); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, GpBitmap **bitmap) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5caeb72..4a5146c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -344,6 +344,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*, GDIPCONST CLSID*,GDIPCONST EncoderParameters*); GpStatus WINGDIPAPI GdipSetImagePalette(GpImage*,GDIPCONST ColorPalette*); +GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes*,GpImageAttributes**); GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*);

1 0