April 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9: Introduce a separate function for vertex declaration creation.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: ba67df7a6034278dcfb5dd9e9da8449d20ba6099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba67df7a6034278dcfb5dd9e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 11 22:52:02 2012 +0200 d3d9: Introduce a separate function for vertex declaration creation. --- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 23 ++++------------------- dlls/d3d9/vertexdeclaration.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 265ecfb..6ad6eed 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -395,8 +395,8 @@ typedef struct IDirect3DVertexDeclaration9Impl { } IDirect3DVertexDeclaration9Impl; void IDirect3DVertexDeclaration9Impl_Destroy(LPDIRECT3DVERTEXDECLARATION9 iface) DECLSPEC_HIDDEN; -HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, - IDirect3DDevice9Impl *device, const D3DVERTEXELEMENT9 *elements) DECLSPEC_HIDDEN; +HRESULT d3d9_vertex_declaration_create(IDirect3DDevice9Impl *device, + const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9Impl **declaration) DECLSPEC_HIDDEN; /* ---------------------- */ /* IDirect3DVertexShader9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a9ca1d3..3aeb437 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2073,7 +2073,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(IDirect3DDevice9Ex *i static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevice9Ex *iface, const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9 **declaration) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); IDirect3DVertexDeclaration9Impl *object; HRESULT hr; @@ -2085,25 +2085,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevi return D3DERR_INVALIDCALL; } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate vertex declaration memory.\n"); - return E_OUTOFMEMORY; - } - - hr = vertexdeclaration_init(object, This, elements); - if (FAILED(hr)) - { - WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - TRACE("Created vertex declaration %p.\n", object); - *declaration = (IDirect3DVertexDeclaration9 *)object; + if (SUCCEEDED(hr = d3d9_vertex_declaration_create(device, elements, &object))) + *declaration = (IDirect3DVertexDeclaration9 *)object; - return D3D_OK; + return hr; } static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(IDirect3DDevice9Ex *iface, diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 3ed9eb7..a003d88 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -367,7 +367,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem return D3D_OK; } -HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, +static HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, IDirect3DDevice9Impl *device, const D3DVERTEXELEMENT9 *elements) { struct wined3d_vertex_element *wined3d_elements; @@ -413,3 +413,30 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, return D3D_OK; } + +HRESULT d3d9_vertex_declaration_create(IDirect3DDevice9Impl *device, + const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9Impl **declaration) +{ + IDirect3DVertexDeclaration9Impl *object; + HRESULT hr; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate vertex declaration memory.\n"); + return E_OUTOFMEMORY; + } + + hr = vertexdeclaration_init(object, device, elements); + if (FAILED(hr)) + { + WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created vertex declaration %p.\n", object); + *declaration = object; + + return D3D_OK; +}

1 0

Henri Verbeet : d3d9: Store wined3d vertex declarations in the fvf lookup table.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 5fc17b84d01c1a38607f3d2501fe28b8fe1fc9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc17b84d01c1a38607f3d250… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 11 22:52:03 2012 +0200 d3d9: Store wined3d vertex declarations in the fvf lookup table. This also implicitly gets rid of the convFVF hack in IDirect3DVertexDeclaration9Impl_Release(). --- dlls/d3d9/d3d9_private.h | 11 ++- dlls/d3d9/device.c | 159 ++++++++++++++++++++++------------------- dlls/d3d9/vertexdeclaration.c | 35 +++------- 3 files changed, 103 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fc17b84d01c1a38607f3…

1 0

Henri Verbeet : ddraw: Get rid of IDirect3DVertexBufferImpl.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: fae3a6430df619b7a190e54d6ba92db3dc7fdd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae3a6430df619b7a190e54d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 11 22:52:04 2012 +0200 ddraw: Get rid of IDirect3DVertexBufferImpl. --- dlls/ddraw/ddraw.c | 4 +- dlls/ddraw/ddraw_private.h | 12 +-- dlls/ddraw/device.c | 8 +- dlls/ddraw/vertexbuffer.c | 279 +++++++++++++++++++++----------------------- 4 files changed, 145 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fae3a6430df619b7a190e…

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXEffectCompilerImpl_QueryInterface ().
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 86b14209a0c1da50dd7fdb0733cc4d584b5a804a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b14209a0c1da50dd7fdb073… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 11 22:52:05 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXEffectCompilerImpl_QueryInterface(). --- dlls/d3dx9_36/effect.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0a07ddf..766f311 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3757,15 +3757,13 @@ static inline struct ID3DXEffectCompilerImpl *impl_from_ID3DXEffectCompiler(ID3D /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXEffectCompilerImpl_QueryInterface(ID3DXEffectCompiler *iface, REFIID riid, void **object) { - struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); - - TRACE("iface %p, riid %s, object %p\n", This, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXEffectCompiler)) { - This->ID3DXEffectCompiler_iface.lpVtbl->AddRef(iface); - *object = This; + iface->lpVtbl->AddRef(iface); + *object = iface; return S_OK; }

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXEffectImpl_QueryInterface( ).
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: cdc2c53158a5d4c3dddbd602022d3a4bdd9f453a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc2c53158a5d4c3dddbd6020… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 11 22:52:06 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXEffectImpl_QueryInterface(). --- dlls/d3dx9_36/effect.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 766f311..c76bdef 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2778,15 +2778,13 @@ static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXEffect)) { - This->ID3DXEffect_iface.lpVtbl->AddRef(iface); - *object = This; + iface->lpVtbl->AddRef(iface); + *object = iface; return S_OK; }

1 0

Vincent Povirk : windowscodecs: Add stub JPEG encoder.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 2e2b045db0f149f79d562b94540486932dc8483b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2b045db0f149f79d562b945… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 10 14:17:17 2011 -0500 windowscodecs: Add stub JPEG encoder. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/jpegformat.c | 175 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 9 ++ dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 5 files changed, 193 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 0f30115..9089924 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -53,6 +53,7 @@ static classinfo wic_classes[] = { {&CLSID_WICGifDecoder, GifDecoder_CreateInstance}, {&CLSID_WICIcoDecoder, IcoDecoder_CreateInstance}, {&CLSID_WICJpegDecoder, JpegDecoder_CreateInstance}, + {&CLSID_WICJpegEncoder, JpegEncoder_CreateInstance}, {&CLSID_WICTiffDecoder, TiffDecoder_CreateInstance}, {&CLSID_WICTiffEncoder, TiffEncoder_CreateInstance}, {&CLSID_WICIcnsEncoder, IcnsEncoder_CreateInstance}, diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 0cb9fc2..15c4377 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -697,6 +697,175 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +typedef struct JpegEncoder { + IWICBitmapEncoder IWICBitmapEncoder_iface; + LONG ref; +} JpegEncoder; + +static inline JpegEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) +{ + return CONTAINING_RECORD(iface, JpegEncoder, IWICBitmapEncoder_iface); +} + +static HRESULT WINAPI JpegEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, + void **ppv) +{ + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapEncoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JpegEncoder_AddRef(IWICBitmapEncoder *iface) +{ + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI JpegEncoder_Release(IWICBitmapEncoder *iface) +{ + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI JpegEncoder_Initialize(IWICBitmapEncoder *iface, + IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) +{ + FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, + GUID *pguidContainerFormat) +{ + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, + IWICBitmapEncoderInfo **ppIEncoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +{ + TRACE("(%p,%p)\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) +{ + TRACE("(%p,%p)\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmapSource *pIPreview) +{ + TRACE("(%p,%p)\n", iface, pIPreview); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, + IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) +{ + FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Commit(IWICBitmapEncoder *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapEncoderVtbl JpegEncoder_Vtbl = { + JpegEncoder_QueryInterface, + JpegEncoder_AddRef, + JpegEncoder_Release, + JpegEncoder_Initialize, + JpegEncoder_GetContainerFormat, + JpegEncoder_GetEncoderInfo, + JpegEncoder_SetColorContexts, + JpegEncoder_SetPalette, + JpegEncoder_SetThumbnail, + JpegEncoder_SetPreview, + JpegEncoder_CreateNewFrame, + JpegEncoder_Commit, + JpegEncoder_GetMetadataQueryWriter +}; + +HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + JpegEncoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + if (!libjpeg_handle && !load_libjpeg()) + { + ERR("Failed writing JPEG because unable to find %s\n",SONAME_LIBJPEG); + return E_FAIL; + } + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(JpegEncoder)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmapEncoder_iface.lpVtbl = &JpegEncoder_Vtbl; + This->ref = 1; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} + #else /* !defined(SONAME_LIBJPEG) */ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) @@ -705,4 +874,10 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return E_FAIL; } +HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + ERR("Trying to save JPEG picture, but JPEG support is not compiled in.\n"); + return E_FAIL; +} + #endif diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 5bb4854..e81ae00 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -937,6 +937,15 @@ static struct regsvr_encoder const encoder_list[] = { ".bmp,.dib,.rle", bmp_encode_formats }, + { &CLSID_WICJpegEncoder, + "The Wine Project", + "JPEG Encoder", + "1.0.0.0", + &GUID_VendorMicrosoft, + "image/jpeg", + ".jpg;.jpeg;.jfif", + jpeg_formats + }, { &CLSID_WICPngEncoder, "The Wine Project", "PNG Encoder", diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 691b1ec..ce322ef 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -37,6 +37,7 @@ extern HRESULT DibDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index bf42679..56cf112 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -81,6 +81,13 @@ coclass WICIcoDecoder { interface IWICBitmapDecoder; } coclass WICJpegDecoder { interface IWICBitmapDecoder; } [ + helpstring("WIC JPEG Encoder"), + threading(both), + uuid(1a34f5c1-4a5a-46dc-b644-1f4567e7a676) +] +coclass WICJpegEncoder { interface IWICBitmapEncoder; } + +[ helpstring("WIC TIFF Decoder"), threading(both), uuid(b54e85d9-fe23-499f-8b88-6acea713752b)

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Initialize.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 8a066b2c20b15432f229781e7c91b2d0d4b4d4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a066b2c20b15432f229781e7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 10 15:10:49 2011 -0500 windowscodecs: Implement JpegEncoder_Initialize. --- dlls/windowscodecs/jpegformat.c | 117 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 15c4377..db5cc29 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -62,7 +62,9 @@ WINE_DECLARE_DEBUG_CHANNEL(jpeg); static void *libjpeg_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(jpeg_CreateCompress); MAKE_FUNCPTR(jpeg_CreateDecompress); +MAKE_FUNCPTR(jpeg_destroy_compress); MAKE_FUNCPTR(jpeg_destroy_decompress); MAKE_FUNCPTR(jpeg_read_header); MAKE_FUNCPTR(jpeg_read_scanlines); @@ -81,7 +83,9 @@ static void *load_libjpeg(void) return NULL; \ } + LOAD_FUNCPTR(jpeg_CreateCompress); LOAD_FUNCPTR(jpeg_CreateDecompress); + LOAD_FUNCPTR(jpeg_destroy_compress); LOAD_FUNCPTR(jpeg_destroy_decompress); LOAD_FUNCPTR(jpeg_read_header); LOAD_FUNCPTR(jpeg_read_scanlines); @@ -700,6 +704,13 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) typedef struct JpegEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; + struct jpeg_destination_mgr dest_mgr; + int initialized; + IStream *stream; + CRITICAL_SECTION lock; + BYTE dest_buffer[1024]; } JpegEncoder; static inline JpegEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -707,6 +718,55 @@ static inline JpegEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) return CONTAINING_RECORD(iface, JpegEncoder, IWICBitmapEncoder_iface); } +static inline JpegEncoder *encoder_from_compress(j_compress_ptr compress) +{ + return CONTAINING_RECORD(compress, JpegEncoder, cinfo); +} + +static void dest_mgr_init_destination(j_compress_ptr cinfo) +{ + JpegEncoder *This = encoder_from_compress(cinfo); + + This->dest_mgr.next_output_byte = This->dest_buffer; + This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); +} + +static jpeg_boolean dest_mgr_empty_output_buffer(j_compress_ptr cinfo) +{ + JpegEncoder *This = encoder_from_compress(cinfo); + HRESULT hr; + ULONG byteswritten; + + hr = IStream_Write(This->stream, This->dest_buffer, + sizeof(This->dest_buffer), &byteswritten); + + if (hr != S_OK || byteswritten == 0) + { + ERR("Failed writing data, hr=%x\n", hr); + return FALSE; + } + + This->dest_mgr.next_output_byte = This->dest_buffer; + This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); + return TRUE; +} + +static void dest_mgr_term_destination(j_compress_ptr cinfo) +{ + JpegEncoder *This = encoder_from_compress(cinfo); + ULONG byteswritten; + HRESULT hr; + + if (This->dest_mgr.free_in_buffer != sizeof(This->dest_buffer)) + { + hr = IStream_Write(This->stream, This->dest_buffer, + sizeof(This->dest_buffer) - This->dest_mgr.free_in_buffer, &byteswritten); + + if (hr != S_OK || byteswritten == 0) + ERR("Failed writing data, hr=%x\n", hr); + } +} + static HRESULT WINAPI JpegEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { @@ -749,6 +809,10 @@ static ULONG WINAPI JpegEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + if (This->initialized) pjpeg_destroy_compress(&This->cinfo); + if (This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -758,8 +822,53 @@ static ULONG WINAPI JpegEncoder_Release(IWICBitmapEncoder *iface) static HRESULT WINAPI JpegEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + jmp_buf jmpbuf; + + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); + + EnterCriticalSection(&This->lock); + + if (This->initialized) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + pjpeg_std_error(&This->jerr); + + This->jerr.error_exit = error_exit_fn; + This->jerr.emit_message = emit_message_fn; + + This->cinfo.err = &This->jerr; + + This->cinfo.client_data = &jmpbuf; + + if (setjmp(jmpbuf)) + { + LeaveCriticalSection(&This->lock); + return E_FAIL; + } + + pjpeg_CreateCompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_compress_struct)); + + This->stream = pIStream; + IStream_AddRef(pIStream); + + This->dest_mgr.next_output_byte = This->dest_buffer; + This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); + + This->dest_mgr.init_destination = dest_mgr_init_destination; + This->dest_mgr.empty_output_buffer = dest_mgr_empty_output_buffer; + This->dest_mgr.term_destination = dest_mgr_term_destination; + + This->cinfo.dest = &This->dest_mgr; + + This->initialized = TRUE; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, @@ -859,6 +968,10 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->IWICBitmapEncoder_iface.lpVtbl = &JpegEncoder_Vtbl; This->ref = 1; + This->initialized = 0; + This->stream = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock"); ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_CreateNewFrame.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 7f302c81b3fe5b24ab69bcfe5bed8a095be86cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f302c81b3fe5b24ab69bcfe5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 10 15:29:01 2011 -0500 windowscodecs: Implement JpegEncoder_CreateNewFrame. --- dlls/windowscodecs/jpegformat.c | 173 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 171 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index db5cc29..50e4367 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -703,11 +703,13 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) typedef struct JpegEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; LONG ref; struct jpeg_compress_struct cinfo; struct jpeg_error_mgr jerr; struct jpeg_destination_mgr dest_mgr; int initialized; + int frame_count; IStream *stream; CRITICAL_SECTION lock; BYTE dest_buffer[1024]; @@ -718,6 +720,11 @@ static inline JpegEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) return CONTAINING_RECORD(iface, JpegEncoder, IWICBitmapEncoder_iface); } +static inline JpegEncoder *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, JpegEncoder, IWICBitmapFrameEncode_iface); +} + static inline JpegEncoder *encoder_from_compress(j_compress_ptr compress) { return CONTAINING_RECORD(compress, JpegEncoder, cinfo); @@ -767,6 +774,134 @@ static void dest_mgr_term_destination(j_compress_ptr cinfo) } } +static HRESULT WINAPI JpegEncoder_Frame_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, + void **ppv) +{ + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) + { + *ppv = &This->IWICBitmapFrameEncode_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JpegEncoder_Frame_AddRef(IWICBitmapFrameEncode *iface) +{ + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + return IWICBitmapEncoder_AddRef(&This->IWICBitmapEncoder_iface); +} + +static ULONG WINAPI JpegEncoder_Frame_Release(IWICBitmapFrameEncode *iface) +{ + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + return IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); +} + +static HRESULT WINAPI JpegEncoder_Frame_Initialize(IWICBitmapFrameEncode *iface, + IPropertyBag2 *pIEncoderOptions) +{ + FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Frame_SetSize(IWICBitmapFrameEncode *iface, + UINT uiWidth, UINT uiHeight) +{ + FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *iface, + double dpiX, double dpiY) +{ + FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pPixelFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Frame_SetColorContexts(IWICBitmapFrameEncode *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Frame_SetPalette(IWICBitmapFrameEncode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegEncoder_Frame_SetThumbnail(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface, + UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) +{ + FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIBitmapSource, WICRect *prc) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegEncoder_Frame_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapFrameEncodeVtbl JpegEncoder_FrameVtbl = { + JpegEncoder_Frame_QueryInterface, + JpegEncoder_Frame_AddRef, + JpegEncoder_Frame_Release, + JpegEncoder_Frame_Initialize, + JpegEncoder_Frame_SetSize, + JpegEncoder_Frame_SetResolution, + JpegEncoder_Frame_SetPixelFormat, + JpegEncoder_Frame_SetColorContexts, + JpegEncoder_Frame_SetPalette, + JpegEncoder_Frame_SetThumbnail, + JpegEncoder_Frame_WritePixels, + JpegEncoder_Frame_WriteSource, + JpegEncoder_Frame_Commit, + JpegEncoder_Frame_GetMetadataQueryWriter +}; + static HRESULT WINAPI JpegEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { @@ -913,8 +1048,40 @@ static HRESULT WINAPI JpegEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitma static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); + + EnterCriticalSection(&This->lock); + + if (This->frame_count != 0) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + } + + if (!This->initialized) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_NOTINITIALIZED; + } + + hr = CreatePropertyBag2(ppIEncoderOptions); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } + + This->frame_count = 1; + + LeaveCriticalSection(&This->lock); + + IWICBitmapEncoder_AddRef(iface); + *ppIFrameEncode = &This->IWICBitmapFrameEncode_iface; + + return S_OK; } static HRESULT WINAPI JpegEncoder_Commit(IWICBitmapEncoder *iface) @@ -967,8 +1134,10 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) if (!This) return E_OUTOFMEMORY; This->IWICBitmapEncoder_iface.lpVtbl = &JpegEncoder_Vtbl; + This->IWICBitmapFrameEncode_iface.lpVtbl = &JpegEncoder_FrameVtbl; This->ref = 1; This->initialized = 0; + This->frame_count = 0; This->stream = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock");

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_Initialize.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 1ce8a66e791d31afdbb2a1ffdf98a430ae2fab4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce8a66e791d31afdbb2a1ffd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 10 15:33:09 2011 -0500 windowscodecs: Implement JpegEncoder_Frame_Initialize. --- dlls/windowscodecs/jpegformat.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 50e4367..2b4b14c 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -710,6 +710,7 @@ typedef struct JpegEncoder { struct jpeg_destination_mgr dest_mgr; int initialized; int frame_count; + int frame_initialized; IStream *stream; CRITICAL_SECTION lock; BYTE dest_buffer[1024]; @@ -812,8 +813,22 @@ static ULONG WINAPI JpegEncoder_Frame_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI JpegEncoder_Frame_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + + EnterCriticalSection(&This->lock); + + if (This->frame_initialized) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->frame_initialized = TRUE; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_SetSize(IWICBitmapFrameEncode *iface, @@ -1138,6 +1153,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->ref = 1; This->initialized = 0; This->frame_count = 0; + This->frame_initialized = 0; This->stream = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock");

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_SetSize.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: f5847da7141f87d0ee569a7ee76c52fed0631455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5847da7141f87d0ee569a7ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 10 15:46:44 2011 -0500 windowscodecs: Implement JpegEncoder_Frame_SetSize. --- dlls/windowscodecs/jpegformat.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 2b4b14c..0149043 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -711,6 +711,8 @@ typedef struct JpegEncoder { int initialized; int frame_count; int frame_initialized; + int started_compress; + UINT width, height; IStream *stream; CRITICAL_SECTION lock; BYTE dest_buffer[1024]; @@ -834,8 +836,23 @@ static HRESULT WINAPI JpegEncoder_Frame_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI JpegEncoder_Frame_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->started_compress) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->width = uiWidth; + This->height = uiHeight; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *iface, @@ -1154,6 +1171,8 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->initialized = 0; This->frame_count = 0; This->frame_initialized = 0; + This->started_compress = 0; + This->width = This->height = 0; This->stream = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock");

1 0