August 2009 - Wine-commits - list.winehq.org

Vincent Povirk : windowscodecs: Implement SetResolution for BMP frame encoder.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: fcb69378a15c06d850dee1e61d674a38a6a693ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb69378a15c06d850dee1e61… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 16:38:11 2009 -0500 windowscodecs: Implement SetResolution for BMP frame encoder. --- dlls/windowscodecs/bmpencode.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index aa0c90f..8e209fb 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -58,6 +58,7 @@ typedef struct BmpFrameEncode { UINT width, height; BYTE *bits; const struct bmp_pixelformat *format; + double xres, yres; } BmpFrameEncode; static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, @@ -139,8 +140,15 @@ static HRESULT WINAPI BmpFrameEncode_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); - return E_NOTIMPL; + BmpFrameEncode *This = (BmpFrameEncode*)iface; + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; + + This->xres = dpiX; + This->yres = dpiY; + + return S_OK; } static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, @@ -372,6 +380,8 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->height = 0; encode->bits = NULL; encode->format = NULL; + encode->xres = 0.0; + encode->yres = 0.0; *ppIFrameEncode = (IWICBitmapFrameEncode*)encode; This->frame = (IWICBitmapFrameEncode*)encode;

1 0

Vincent Povirk : windowscodecs: Implement SetPixelFormat for BMP frame encoder.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: db040535f5e58db13b94724aac7624d779e42b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db040535f5e58db13b94724aa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 16:35:20 2009 -0500 windowscodecs: Implement SetPixelFormat for BMP frame encoder. --- dlls/windowscodecs/bmpencode.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index f170abe..aa0c90f 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -35,6 +35,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +struct bmp_pixelformat { + const WICPixelFormatGUID *guid; + UINT bpp; + DWORD compression; + DWORD redmask; + DWORD greenmask; + DWORD bluemask; + DWORD alphamask; +}; + +static const struct bmp_pixelformat formats[] = { + {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, + {NULL} +}; + typedef struct BmpFrameEncode { const IWICBitmapFrameEncodeVtbl *lpVtbl; LONG ref; @@ -42,6 +57,7 @@ typedef struct BmpFrameEncode { BOOL initialized; UINT width, height; BYTE *bits; + const struct bmp_pixelformat *format; } BmpFrameEncode; static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, @@ -130,8 +146,24 @@ static HRESULT WINAPI BmpFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pPixelFormat)); - return E_NOTIMPL; + BmpFrameEncode *This = (BmpFrameEncode*)iface; + int i; + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; + + for (i=0; formats[i].guid; i++) + { + if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!formats[i].guid) i = 0; + + This->format = &formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI BmpFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, @@ -339,6 +371,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->width = 0; encode->height = 0; encode->bits = NULL; + encode->format = NULL; *ppIFrameEncode = (IWICBitmapFrameEncode*)encode; This->frame = (IWICBitmapFrameEncode*)encode;

1 0

Vincent Povirk : windowscodecs: Implement SetSize for the BMP frame encoder .
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 07fd33d1fa73e15f2a9c39ed46842989c384316c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07fd33d1fa73e15f2a9c39ed4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 16:23:41 2009 -0500 windowscodecs: Implement SetSize for the BMP frame encoder. --- dlls/windowscodecs/bmpencode.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index a7cabe4..f170abe 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -40,6 +40,8 @@ typedef struct BmpFrameEncode { LONG ref; IStream *stream; BOOL initialized; + UINT width, height; + BYTE *bits; } BmpFrameEncode; static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, @@ -107,8 +109,15 @@ static HRESULT WINAPI BmpFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); - return E_NOTIMPL; + BmpFrameEncode *This = (BmpFrameEncode*)iface; + TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); + + if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; + + This->width = uiWidth; + This->height = uiHeight; + + return S_OK; } static HRESULT WINAPI BmpFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, @@ -327,6 +336,9 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IStream_AddRef(This->stream); encode->stream = This->stream; encode->initialized = FALSE; + encode->width = 0; + encode->height = 0; + encode->bits = NULL; *ppIFrameEncode = (IWICBitmapFrameEncode*)encode; This->frame = (IWICBitmapFrameEncode*)encode;

1 0

Vincent Povirk : windowscodecs: Implement Initialize for the BMP frame encoder.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 4664116a42d6a0800eff706dbe97a8e4e12b2491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4664116a42d6a0800eff706db… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 16:18:40 2009 -0500 windowscodecs: Implement Initialize for the BMP frame encoder. --- dlls/windowscodecs/bmpencode.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 7b47450..a7cabe4 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -39,6 +39,7 @@ typedef struct BmpFrameEncode { const IWICBitmapFrameEncodeVtbl *lpVtbl; LONG ref; IStream *stream; + BOOL initialized; } BmpFrameEncode; static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, @@ -93,8 +94,14 @@ static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI BmpFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); - return E_NOTIMPL; + BmpFrameEncode *This = (BmpFrameEncode*)iface; + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + + if (This->initialized) return WINCODEC_ERR_WRONGSTATE; + + This->initialized = TRUE; + + return S_OK; } static HRESULT WINAPI BmpFrameEncode_SetSize(IWICBitmapFrameEncode *iface, @@ -319,6 +326,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->ref = 2; IStream_AddRef(This->stream); encode->stream = This->stream; + encode->initialized = FALSE; *ppIFrameEncode = (IWICBitmapFrameEncode*)encode; This->frame = (IWICBitmapFrameEncode*)encode;

1 0

Vincent Povirk : windowscodecs: Implement CreateNewFrame for BMP encoder.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 8cfc5befc986e8a730c4261f5b743176d21b794f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cfc5befc986e8a730c4261f5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 16:10:12 2009 -0500 windowscodecs: Implement CreateNewFrame for BMP encoder. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/bmpencode.c | 182 +++++++++++++++++++++++++++++++- dlls/windowscodecs/propertybag.c | 147 ++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 + 4 files changed, 330 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cfc5befc986e8a730c42…

1 0

Vincent Povirk : windowscodecs: Implement Initialize for BMP encoder.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 941f2d3a3b31a16844885e182bd18c7c29e528b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=941f2d3a3b31a16844885e182… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 14:42:08 2009 -0500 windowscodecs: Implement Initialize for BMP encoder. --- dlls/windowscodecs/bmpencode.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index f0075ee..9440460 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BmpEncoder { const IWICBitmapEncoderVtbl *lpVtbl; LONG ref; + IStream *stream; } BmpEncoder; static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, @@ -82,6 +83,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { + if (This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -91,8 +93,14 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) static HRESULT WINAPI BmpEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); - return E_NOTIMPL; + BmpEncoder *This = (BmpEncoder*)iface; + + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); + + IStream_AddRef(pIStream); + This->stream = pIStream; + + return S_OK; } static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, @@ -186,6 +194,7 @@ HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lpVtbl = &BmpEncoder_Vtbl; This->ref = 1; + This->stream = NULL; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Add stub BMP encoder.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: fbadf7c0ed2cee379500b998473d5923e326d5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbadf7c0ed2cee379500b9984… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 13:47:29 2009 -0500 windowscodecs: Add stub BMP encoder. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/bmpencode.c | 194 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/regsvr.c | 6 + dlls/windowscodecs/wincodecs_private.h | 1 + 5 files changed, 203 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 18bc1e4..3736ed1 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = uuid ole32 advapi32 kernel32 C_SRCS = \ bmpdecode.c \ + bmpencode.c \ clsfactory.c \ imgfactory.c \ info.c \ diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c new file mode 100644 index 0000000..f0075ee --- /dev/null +++ b/dlls/windowscodecs/bmpencode.c @@ -0,0 +1,194 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct BmpEncoder { + const IWICBitmapEncoderVtbl *lpVtbl; + LONG ref; +} BmpEncoder; + +static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, + void **ppv) +{ + BmpEncoder *This = (BmpEncoder*)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 BmpEncoder_AddRef(IWICBitmapEncoder *iface) +{ + BmpEncoder *This = (BmpEncoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) +{ + BmpEncoder *This = (BmpEncoder*)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 BmpEncoder_Initialize(IWICBitmapEncoder *iface, + IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) +{ + FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, + GUID *pguidContainerFormat) +{ + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, + IWICBitmapEncoderInfo **ppIEncoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpEncoder_SetColorContexts(IWICBitmapEncoder *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +{ + TRACE("(%p,%p)\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI BmpEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) +{ + TRACE("(%p,%p)\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI BmpEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmapSource *pIPreview) +{ + TRACE("(%p,%p)\n", iface, pIPreview); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, + IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) +{ + FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpEncoder_Commit(IWICBitmapEncoder *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapEncoderVtbl BmpEncoder_Vtbl = { + BmpEncoder_QueryInterface, + BmpEncoder_AddRef, + BmpEncoder_Release, + BmpEncoder_Initialize, + BmpEncoder_GetContainerFormat, + BmpEncoder_GetEncoderInfo, + BmpEncoder_SetColorContexts, + BmpEncoder_SetPalette, + BmpEncoder_SetThumbnail, + BmpEncoder_SetPreview, + BmpEncoder_CreateNewFrame, + BmpEncoder_Commit, + BmpEncoder_GetMetadataQueryWriter +}; + +HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + BmpEncoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpEncoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &BmpEncoder_Vtbl; + This->ref = 1; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 37e30e5..cd68d91 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -44,6 +44,7 @@ typedef struct { static classinfo wic_classes[] = { {&CLSID_WICImagingFactory, ImagingFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, + {&CLSID_WICBmpEncoder, BmpEncoder_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 2a3996e..f901315 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -564,6 +564,12 @@ static struct regsvr_coclass const coclass_list[] = { "windowscodecs.dll", "Apartment" }, + { &CLSID_WICBmpEncoder, + "WIC BMP Encoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 6e4e752..93bb09d 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -21,6 +21,7 @@ extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); +extern HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT PaletteImpl_Create(IWICPalette **palette);

1 0

Vincent Povirk : include: Add definitions needed for WIC bitmap encoding.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: b33a8da49dcd0d90b1b7a6493af78993e280708d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33a8da49dcd0d90b1b7a6493… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 10:59:26 2009 -0500 include: Add definitions needed for WIC bitmap encoding. --- include/wincodec.idl | 114 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 113 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 40e69eb..ae53a2a 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -51,6 +51,13 @@ typedef enum WICBitmapDecoderCapabilities { WICBitmapDecoderCapabilityCanDecodeThumbnail = 0x00000010, } WICBitmapDecoderCapabilities; +typedef enum WICBitmapEncoderCacheOption { + WICBitmapEncoderCacheInMemory = 0x00000000, + WICBitmapEncoderCacheTempFile = 0x00000001, + WICBitmapEncoderNoCache = 0x00000002, + WICBITMAPENCODERCACHEOPTION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICBitmapEncoderCacheOption; + typedef enum WICBitmapPaletteType { WICBitmapPaletteTypeCustom = 0x00000000, WICBitmapPaletteTypeMedianCut = 0x00000001, @@ -130,6 +137,7 @@ typedef struct WICBitmapPattern { typedef UINT32 WICColor; cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") +cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") @@ -137,7 +145,6 @@ cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") interface IWICBitmap; -interface IWICBitmapEncoder; interface IWICPalette; interface IWICFormatConverter; interface IWICBitmapScaler; @@ -402,6 +409,103 @@ interface IWICBitmapDecoder : IUnknown [ object, + uuid(00000105-a8f2-4877-ba0a-fd2b6645fb94) +] +interface IWICBitmapFrameEncode : IUnknown +{ + HRESULT Initialize( + [in, unique] IPropertyBag2 *pIEncoderOptions); + + HRESULT SetSize( + [in] UINT uiWidth, + [in] UINT uiHeight); + + HRESULT SetResolution( + [in] double dpiX, + [in] double dpiY); + + HRESULT SetPixelFormat( + [in, out] WICPixelFormatGUID *pPixelFormat); + + HRESULT SetColorContexts( + [in] UINT cCount, + [in, size_is(cCount)] IWICColorContext **ppIColorContext); + + HRESULT SetPalette( + [in] IWICPalette *pIPalette); + + HRESULT SetThumbnail( + [in] IWICBitmapSource *pIThumbnail); + + HRESULT WritePixels( + [in] UINT lineCount, + [in] UINT cbStride, + [in] UINT cbBufferSize, + [in, size_is(cbBufferSize)] BYTE *pbPixels); + + HRESULT WriteSource( + [in] IWICBitmapSource *pIBitmapSource, + [in, unique] WICRect *prc); + + HRESULT Commit(); + + HRESULT GetMetadataQueryWriter( + IWICMetadataQueryWriter **ppIMetadataQueryWriter); +} + +interface IWICBitmapEncoder; + +[ + object, + uuid(94c9b4ee-a09f-4f92-8a1e-4a9bce7e76fb) +] +interface IWICBitmapEncoderInfo : IWICBitmapCodecInfo +{ + HRESULT CreateInstance( + [out] IWICBitmapEncoder **ppIBitmapEncoder); +} + +[ + object, + uuid(00000103-a8f2-4877-ba0a-fd2b6645fb94) +] +interface IWICBitmapEncoder : IUnknown +{ + HRESULT Initialize( + [in] IStream *pIStream, + [in] WICBitmapEncoderCacheOption cacheOption); + + HRESULT GetContainerFormat( + [out] GUID *pguidContainerFormat); + + HRESULT GetEncoderInfo( + [out] IWICBitmapEncoderInfo **ppIEncoderInfo); + + HRESULT SetColorContexts( + [in] UINT cCount, + [in, size_is(cCount)] IWICColorContext **ppIColorContext); + + HRESULT SetPalette( + [in] IWICPalette *pIPalette); + + HRESULT SetThumbnail( + [in] IWICBitmapSource *pIThumbnail); + + HRESULT SetPreview( + [in] IWICBitmapSource *pIPreview); + + HRESULT CreateNewFrame( + [out] IWICBitmapFrameEncode **ppIFrameEncode, + [in, out, unique] IPropertyBag2 **ppIEncoderOptions); + + HRESULT Commit(); + + HRESULT GetMetadataQueryWriter( + [out] IWICMetadataQueryWriter **ppIMetadataQueryWriter); +} + +[ + object, uuid(135ff860-22b7-4ddf-b0f6-218f4f299a43) ] interface IWICStream : IStream @@ -559,6 +663,13 @@ cpp_quote("DEFINE_GUID(CLSID_WICGifDecoder, 0x381dda3c,0x9ce9,0x4834,0xa2,0x3e,0 cpp_quote("DEFINE_GUID(CLSID_WICTiffDecoder, 0xb54e85d9,0xfe23,0x499f,0x8b,0x88,0x6a,0xce,0xa7,0x13,0x75,0x2b);") cpp_quote("DEFINE_GUID(CLSID_WICWmpDecoder, 0xa26cec36,0x234c,0x4950,0xae,0x16,0xe3,0x4a,0xac,0xe7,0x1d,0x0d);") +cpp_quote("DEFINE_GUID(CLSID_WICBmpEncoder, 0x69be8bb4,0xd66d,0x47c8,0x86,0x5a,0xed,0x15,0x89,0x43,0x37,0x82);") +cpp_quote("DEFINE_GUID(CLSID_WICPngEncoder, 0x27949969,0x876a,0x41d7,0x94,0x47,0x56,0x8f,0x6a,0x35,0xa4,0xdc);") +cpp_quote("DEFINE_GUID(CLSID_WICJpegEncoder, 0x1a34f5c1,0x4a5a,0x46dc,0xb6,0x44,0x1f,0x45,0x67,0xe7,0xa6,0x76);") +cpp_quote("DEFINE_GUID(CLSID_WICGifEncoder, 0x114f5598,0x0b22,0x40a0,0x86,0xa1,0xc8,0x3e,0xa4,0x95,0xad,0xbd);") +cpp_quote("DEFINE_GUID(CLSID_WICTiffEncoder, 0x0131be10,0x2001,0x4c5f,0xa9,0xb0,0xcc,0x88,0xfa,0xb6,0x4c,0xe8);") +cpp_quote("DEFINE_GUID(CLSID_WICWmpEncoder, 0xac4ce3cb,0xe1c1,0x44cd,0x82,0x15,0x5a,0x16,0x65,0x50,0x9e,0xc2);") + cpp_quote("DEFINE_GUID(GUID_ContainerFormatBmp, 0x0af1d87e,0xfcfe,0x4188,0xbd,0xeb,0xa7,0x90,0x64,0x71,0xcb,0xe3);") cpp_quote("DEFINE_GUID(GUID_ContainerFormatPng, 0x1b7cfaf4,0x713f,0x473c,0xbb,0xcd,0x61,0x37,0x42,0x5f,0xae,0xaf);") cpp_quote("DEFINE_GUID(GUID_ContainerFormatIco, 0xa3a860c4,0x338f,0x4c17,0x91,0x9a,0xfb,0xa4,0xb5,0x62,0x8f,0x21);") @@ -570,3 +681,4 @@ cpp_quote("DEFINE_GUID(GUID_ContainerFormatWmp, 0x57a37caa,0x367a,0x4540,0x91,0x cpp_quote("DEFINE_GUID(GUID_VendorMicrosoft, 0xf0e749ca,0xedef,0x4589,0xa7,0x3a,0xee,0x0e,0x62,0x6a,0x2a,0x2b);") cpp_quote("DEFINE_GUID(CATID_WICBitmapDecoders, 0x7ed96837,0x96f0,0x4812,0xb2,0x11,0xf1,0x3c,0x24,0x11,0x7e,0xd3);") +cpp_quote("DEFINE_GUID(CATID_WICBitmapEncoders, 0xac757296,0x3522,0x4e11,0x98,0x62,0xc1,0x7b,0xe5,0xa1,0x76,0x7e);")

1 0

Stefan Leichter : advapi32: Add stub for SaferGetPolicyInformation.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 5ffba2da9777ce255832569be454fa9edac5425a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffba2da9777ce255832569be… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Aug 11 20:09:58 2009 +0200 advapi32: Add stub for SaferGetPolicyInformation. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 10 ++++++++++ include/winsafer.h | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e9168aa..4f3e693 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -542,7 +542,7 @@ # @ stub SaferComputeTokenFromLevel @ stdcall SaferCreateLevel(long long long ptr ptr) # @ stub SaferGetLevelInformation -# @ stub SaferGetPolicyInformation +@ stdcall SaferGetPolicyInformation(long long long ptr ptr ptr) # @ stub SaferIdentifyLevel # @ stub SaferRecordEventLogEntry # @ stub SaferSetLevelInformation diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2ca760e..9d3fe51 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5340,3 +5340,13 @@ DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName, return ERROR_SUCCESS; } + +/****************************************************************************** + * SaferGetPolicyInformation [ADVAPI32.@] + */ +BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class, DWORD size, + PVOID buffer, PDWORD required, LPVOID lpReserved) +{ + FIXME("(%u %u %u %p %p %p) stub\n", scope, class, size, buffer, required, lpReserved); + return FALSE; +} diff --git a/include/winsafer.h b/include/winsafer.h index d7b75c7..837a551 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -43,6 +43,16 @@ DECLARE_HANDLE(SAFER_LEVEL_HANDLE); WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); +typedef enum _SAFER_POLICY_INFO_CLASS { + SaferPolicyLevelList = 1, + SaferPolicyEnableTransparentEnforcement, + SaferPolicyDefaultLevel, + SaferPolicyEvaluateUserScope, + SaferPolicyScopeFlags +} SAFER_POLICY_INFO_CLASS; + +WINADVAPI BOOL WINAPI SaferGetPolicyInformation(DWORD,SAFER_POLICY_INFO_CLASS,DWORD,PVOID,PDWORD,LPVOID); + #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : comctl32/listview: Some tests to show we don' t handle WM_SETREDRAW right.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: e41d0dd7de4b1e56fa6a6b8d16dc20921061fef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41d0dd7de4b1e56fa6a6b8d1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 12 12:20:30 2009 +0400 comctl32/listview: Some tests to show we don't handle WM_SETREDRAW right. --- dlls/comctl32/tests/listview.c | 50 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 72abdff..516445c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -288,6 +288,11 @@ static const struct message scroll_parent_seq[] = { { 0 } }; +static const struct message setredraw_seq[] = { + { WM_SETREDRAW, sent|id|wparam, FALSE, 0, LISTVIEW_ID }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -2786,8 +2791,9 @@ static void test_setredraw(void) HWND hwnd; DWORD_PTR style; DWORD ret; + HDC hdc; - hwnd = create_listview_control(0); + hwnd = create_listview_control(LVS_OWNERDATA); ok(hwnd != NULL, "failed to create a listview window\n"); /* Passing WM_SETREDRAW to DefWinProc removes WS_VISIBLE. @@ -2803,6 +2809,48 @@ static void test_setredraw(void) expect(0, ret); style = GetWindowLongPtr(hwnd, GWL_STYLE); ok(style & WS_VISIBLE, "Expected WS_VISIBLE to be set\n"); + ret = SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); + expect(0, ret); + + /* WM_ERASEBKGND */ + hdc = GetWindowDC(hwndparent); + ret = SendMessage(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + expect(TRUE, ret); + ret = SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); + expect(0, ret); + ret = SendMessage(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + expect(TRUE, ret); + ret = SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); + expect(0, ret); + ReleaseDC(hwndparent, hdc); + + /* check notification messages to show that repainting is disabled */ + ret = SendMessage(hwnd, LVM_SETITEMCOUNT, 1, 0); + expect(TRUE, ret); + ret = SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); + expect(0, ret); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "redraw after WM_SETREDRAW (FALSE)", TRUE); + + ret = SendMessage(hwnd, LVM_SETBKCOLOR, 0, CLR_NONE); + expect(TRUE, ret); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "redraw after WM_SETREDRAW (FALSE) with CLR_NONE bkgnd", TRUE); + + /* message isn't forwarded to header */ + subclass_header(hwnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); + expect(0, ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, setredraw_seq, + "WM_SETREDRAW: not forwarded to header", FALSE); DestroyWindow(hwnd); }

1 0