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

Jacek Caban : mshtml: Return referenced object in get_node_obj.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 4e10fcc953c6866a9a88ecde065fb70c6497147d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e10fcc953c6866a9a88ecde0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:21:10 2012 +0200 mshtml: Return referenced object in get_node_obj. --- dlls/mshtml/htmlnode.c | 57 ++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 5e1b8b3..46061a6 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -495,11 +495,10 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode VARIANT refChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - nsIDOMNode *nsnode, *nsref = NULL; - HTMLDOMNode *new_child; - HTMLDOMNode *node_obj; + HTMLDOMNode *new_child, *node_obj, *ref_node = NULL; + nsIDOMNode *nsnode; nsresult nsres; - HRESULT hres; + HRESULT hres = S_OK; TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); @@ -513,27 +512,31 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode case VT_NULL: break; case VT_DISPATCH: { - HTMLDOMNode *ref_node; - ref_node = get_node_obj(This->doc, (IUnknown*)V_DISPATCH(&refChild)); if(!ref_node) { ERR("unvalid node\n"); - return E_FAIL; + hres = E_FAIL; + break; } - - nsref = ref_node->nsnode; break; } default: FIXME("unimplemented refChild %s\n", debugstr_variant(&refChild)); - return E_NOTIMPL; + hres = E_NOTIMPL; } - nsres = nsIDOMNode_InsertBefore(This->nsnode, new_child->nsnode, nsref, &nsnode); - if(NS_FAILED(nsres)) { - ERR("InsertBefore failed: %08x\n", nsres); - return E_FAIL; + if(SUCCEEDED(hres)) { + nsres = nsIDOMNode_InsertBefore(This->nsnode, new_child->nsnode, ref_node ? ref_node->nsnode : NULL, &nsnode); + if(NS_FAILED(nsres)) { + ERR("InsertBefore failed: %08x\n", nsres); + hres = E_FAIL; + } } + node_release(new_child); + if(ref_node) + node_release(ref_node); + if(FAILED(hres)) + return hres; hres = get_node(This->doc, nsnode, TRUE, &node_obj); nsIDOMNode_Release(nsnode); @@ -560,6 +563,7 @@ static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode return E_FAIL; nsres = nsIDOMNode_RemoveChild(This->nsnode, node_obj->nsnode, &nsnode); + node_release(node_obj); if(NS_FAILED(nsres)) { ERR("RemoveChild failed: %08x\n", nsres); return E_FAIL; @@ -579,8 +583,7 @@ static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - HTMLDOMNode *node_new; - HTMLDOMNode *node_old; + HTMLDOMNode *node_new, *node_old, *ret_node; nsIDOMNode *nsnode; nsresult nsres; HRESULT hres; @@ -592,22 +595,23 @@ static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode return E_FAIL; node_old = get_node_obj(This->doc, (IUnknown*)oldChild); - if(!node_old) + if(!node_old) { + node_release(node_new); return E_FAIL; + } nsres = nsIDOMNode_ReplaceChild(This->nsnode, node_new->nsnode, node_old->nsnode, &nsnode); - if(NS_FAILED(nsres)) { + node_release(node_new); + node_release(node_old); + if(NS_FAILED(nsres)) return E_FAIL; - } - - nsnode = node_new->nsnode; - hres = get_node(This->doc, nsnode, TRUE, &node_new); + hres = get_node(This->doc, nsnode, TRUE, &ret_node); nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres; - *node = &node_new->IHTMLDOMNode_iface; + *node = &ret_node->IHTMLDOMNode_iface; return S_OK; } @@ -676,9 +680,10 @@ static HRESULT WINAPI HTMLDOMNode_appendChild(IHTMLDOMNode *iface, IHTMLDOMNode return E_FAIL; nsres = nsIDOMNode_AppendChild(This->nsnode, node_obj->nsnode, &nsnode); + node_release(node_obj); if(NS_FAILED(nsres)) { - WARN("AppendChild failed: %08x\n", nsres); - nsnode = node_obj->nsnode; + ERR("AppendChild failed: %08x\n", nsres); + return E_FAIL; } hres = get_node(This->doc, nsnode, TRUE, &node_obj); @@ -1123,7 +1128,6 @@ static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface) IHTMLDOMNode *node; IUnknown_QueryInterface(iface, &IID_IHTMLDOMNode, (void**)&node); - IHTMLDOMNode_Release(node); while(iter) { if(&iter->IHTMLDOMNode_iface == node) @@ -1132,6 +1136,7 @@ static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface) } FIXME("Not found %p\n", iface); + IHTMLDOMNode_Release(node); return NULL; }

1 0

Jacek Caban : mshtml: Reimplement get_node_obj using vtbl comparison.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 3ab9eaf67919d834688ccd21df519ff032f434ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab9eaf67919d834688ccd21d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:22:12 2012 +0200 mshtml: Reimplement get_node_obj using vtbl comparison. --- dlls/mshtml/htmlnode.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 46061a6..3951494 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -883,6 +883,15 @@ static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = { HTMLDOMNode_get_nextSibling }; +static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface) +{ + IHTMLDOMNode *node; + HRESULT hres; + + hres = IUnknown_QueryInterface(iface, &IID_IHTMLDOMNode, (void**)&node); + return hres == S_OK && node->lpVtbl == &HTMLDOMNodeVtbl ? impl_from_IHTMLDOMNode(node) : NULL; +} + static inline HTMLDOMNode *impl_from_IHTMLDOMNode2(IHTMLDOMNode2 *iface) { return CONTAINING_RECORD(iface, HTMLDOMNode, IHTMLDOMNode2_iface); @@ -1117,29 +1126,6 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO return create_node(This, nsnode, ret); } -/* - * FIXME - * We should use better way for getting node object (like private interface) - * or avoid it at all. - */ -static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface) -{ - HTMLDOMNode *iter = This->nodes; - IHTMLDOMNode *node; - - IUnknown_QueryInterface(iface, &IID_IHTMLDOMNode, (void**)&node); - - while(iter) { - if(&iter->IHTMLDOMNode_iface == node) - return iter; - iter = iter->next; - } - - FIXME("Not found %p\n", iface); - IHTMLDOMNode_Release(node); - return NULL; -} - void release_nodes(HTMLDocumentNode *This) { HTMLDOMNode *iter, *next;

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapScaler::GetSize.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 6e790c9aec35f3b388bd566df5601833296af7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e790c9aec35f3b388bd566df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 16:21:24 2012 -0600 windowscodecs: Implement IWICBitmapScaler::GetSize. --- dlls/windowscodecs/scaler.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index be21dcc..f7ac48a 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -102,9 +102,19 @@ static ULONG WINAPI BitmapScaler_Release(IWICBitmapScaler *iface) static HRESULT WINAPI BitmapScaler_GetSize(IWICBitmapScaler *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + if (!puiWidth || !puiHeight) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + *puiWidth = This->width; + *puiHeight = This->height; + + return S_OK; } static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapScaler::GetPixelFormat.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 0b8a71643de0f6c5f76a292828cbcbeee0b4f7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8a71643de0f6c5f76a29282… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 16:31:00 2012 -0600 windowscodecs: Implement IWICBitmapScaler::GetPixelFormat. --- dlls/windowscodecs/scaler.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index f7ac48a..2289a9d 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -120,9 +120,16 @@ static HRESULT WINAPI BitmapScaler_GetSize(IWICBitmapScaler *iface, static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p): stub\n", iface, pPixelFormat); + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + if (!pPixelFormat) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + return IWICBitmapSource_GetPixelFormat(This->source, pPixelFormat); } static HRESULT WINAPI BitmapScaler_GetResolution(IWICBitmapScaler *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapScaler::GetResolution.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: e4f8ab605e24df0bdd79bb1d2fa8f67145cbe4c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f8ab605e24df0bdd79bb1d2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 16:32:31 2012 -0600 windowscodecs: Implement IWICBitmapScaler::GetResolution. --- dlls/windowscodecs/scaler.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 2289a9d..511968c 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -135,9 +135,16 @@ static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface, static HRESULT WINAPI BitmapScaler_GetResolution(IWICBitmapScaler *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + if (!pDpiX || !pDpiY) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + return IWICBitmapSource_GetResolution(This->source, pDpiX, pDpiY); } static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapScaler::CopyPalette.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 22383aa6421a8c2fb9f8d00d39551ffd7a52799c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22383aa6421a8c2fb9f8d00d3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 16:34:51 2012 -0600 windowscodecs: Implement IWICBitmapScaler::CopyPalette. --- dlls/windowscodecs/scaler.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 511968c..992d12c 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -150,9 +150,16 @@ static HRESULT WINAPI BitmapScaler_GetResolution(IWICBitmapScaler *iface, static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + TRACE("(%p,%p)\n", iface, pIPalette); - return E_NOTIMPL; + if (!pIPalette) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + return IWICBitmapSource_CopyPalette(This->source, pIPalette); } static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface,

1 0

Vincent Povirk : windowscodecs: Implement BitmapScaler_CopyPixels.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: e7f31ddb81e0b981b2681b4df189cee066f8d3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f31ddb81e0b981b2681b4df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 12:56:10 2012 -0500 windowscodecs: Implement BitmapScaler_CopyPixels. --- dlls/windowscodecs/main.c | 25 +++++ dlls/windowscodecs/scaler.c | 178 ++++++++++++++++++++++++++++++- dlls/windowscodecs/wincodecs_private.h | 2 + 3 files changed, 199 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 8dd847e..091b9fb 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -17,6 +17,7 @@ */ +#define COBJMACROS #include "config.h" #include <stdarg.h> @@ -136,3 +137,27 @@ void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT } } } + +HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) +{ + HRESULT hr; + IWICComponentInfo *info; + IWICPixelFormatInfo *formatinfo; + + hr = CreateComponentInfo(pixelformat, &info); + if (SUCCEEDED(hr)) + { + hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo, (void**)&formatinfo); + + if (SUCCEEDED(hr)) + { + hr = IWICPixelFormatInfo_GetBitsPerPixel(formatinfo, bpp); + + IWICPixelFormatInfo_Release(formatinfo); + } + + IWICComponentInfo_Release(info); + } + + return hr; +} diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 992d12c..06d900d 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -38,7 +38,11 @@ typedef struct BitmapScaler { LONG ref; IWICBitmapSource *source; UINT width, height; + UINT src_width, src_height; WICBitmapInterpolationMode mode; + UINT bpp; + void (*fn_get_required_source_rect)(struct BitmapScaler*,UINT,UINT,WICRect*); + void (*fn_copy_scanline)(struct BitmapScaler*,UINT,UINT,UINT,BYTE**,UINT,UINT,BYTE*); CRITICAL_SECTION lock; /* must be held when initialized */ } BitmapScaler; @@ -162,12 +166,138 @@ static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, return IWICBitmapSource_CopyPalette(This->source, pIPalette); } +static void NearestNeighbor_GetRequiredSourceRect(BitmapScaler *This, + UINT x, UINT y, WICRect *src_rect) +{ + src_rect->X = x * This->src_width / This->width; + src_rect->Y = y * This->src_height / This->height; + src_rect->Width = src_rect->Height = 1; +} + +static void NearestNeighbor_CopyScanline(BitmapScaler *This, + UINT dst_x, UINT dst_y, UINT dst_width, + BYTE **src_data, UINT src_data_x, UINT src_data_y, BYTE *pbBuffer) +{ + int i; + UINT bytesperpixel = This->bpp/8; + UINT src_x, src_y; + + src_y = dst_y * This->src_height / This->height - src_data_y; + + for (i=0; i<dst_width; i++) + { + src_x = (dst_x + i) * This->src_width / This->width - src_data_x; + memcpy(pbBuffer + bytesperpixel * i, src_data[src_y] + bytesperpixel * src_x, bytesperpixel); + } +} + static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + HRESULT hr; + WICRect dest_rect; + WICRect src_rect_ul, src_rect_br, src_rect; + BYTE **src_rows; + BYTE *src_bits; + ULONG bytesperrow; + ULONG src_bytesperrow; + ULONG buffer_size; + UINT y; + + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + EnterCriticalSection(&This->lock); + + if (!This->source) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + if (prc) + dest_rect = *prc; + else + { + dest_rect.X = dest_rect.Y = 0; + dest_rect.Width = This->width; + dest_rect.Height = This->height; + } + + if (dest_rect.X < 0 || dest_rect.Y < 0 || + dest_rect.X+dest_rect.Width > This->width|| dest_rect.Y+dest_rect.Height > This->height) + { + hr = E_INVALIDARG; + goto end; + } + + bytesperrow = ((This->bpp * dest_rect.Width)+7)/8; + + if (cbStride < bytesperrow) + { + hr = E_INVALIDARG; + goto end; + } - return E_NOTIMPL; + if ((cbStride * dest_rect.Height) > cbBufferSize) + { + hr = E_INVALIDARG; + goto end; + } + + /* MSDN recommends calling CopyPixels once for each scanline from top to + * bottom, and claims codecs optimize for this. Ideally, when called in this + * way, we should avoid requesting a scanline from the source more than + * once, by saving the data that will be useful for the next scanline after + * the call returns. The GetRequiredSourceRect/CopyScanline functions are + * designed to make it possible to do this in a generic way, but for now we + * just grab all the data we need in each call. */ + + This->fn_get_required_source_rect(This, dest_rect.X, dest_rect.Y, &src_rect_ul); + This->fn_get_required_source_rect(This, dest_rect.X+dest_rect.Width-1, + dest_rect.Y+dest_rect.Height-1, &src_rect_br); + + src_rect.X = src_rect_ul.X; + src_rect.Y = src_rect_ul.Y; + src_rect.Width = src_rect_br.Width + src_rect_br.X - src_rect_ul.X; + src_rect.Height = src_rect_br.Height + src_rect_br.Y - src_rect_ul.Y; + + src_bytesperrow = (src_rect.Width * This->bpp + 7)/8; + buffer_size = src_bytesperrow * src_rect.Height; + + src_rows = HeapAlloc(GetProcessHeap(), 0, sizeof(BYTE*) * src_rect.Height); + src_bits = HeapAlloc(GetProcessHeap(), 0, buffer_size); + + if (!src_rows || !src_bits) + { + HeapFree(GetProcessHeap(), 0, src_rows); + HeapFree(GetProcessHeap(), 0, src_bits); + hr = E_OUTOFMEMORY; + goto end; + } + + for (y=0; y<src_rect.Height; y++) + src_rows[y] = src_bits + y * src_bytesperrow; + + hr = IWICBitmapSource_CopyPixels(This->source, &src_rect, src_bytesperrow, + buffer_size, src_bits); + + if (SUCCEEDED(hr)) + { + for (y=0; y < dest_rect.Height; y++) + { + This->fn_copy_scanline(This, dest_rect.X, dest_rect.Y+y, dest_rect.Width, + src_rows, src_rect.X, src_rect.Y, pbBuffer + cbStride * y); + } + } + + HeapFree(GetProcessHeap(), 0, src_rows); + HeapFree(GetProcessHeap(), 0, src_bits); + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI BitmapScaler_Initialize(IWICBitmapScaler *iface, @@ -175,7 +305,8 @@ static HRESULT WINAPI BitmapScaler_Initialize(IWICBitmapScaler *iface, WICBitmapInterpolationMode mode) { BitmapScaler *This = impl_from_IWICBitmapScaler(iface); - HRESULT hr=S_OK; + HRESULT hr; + GUID src_pixelformat; TRACE("(%p,%p,%u,%u,%u)\n", iface, pISource, uiWidth, uiHeight, mode); @@ -187,13 +318,45 @@ static HRESULT WINAPI BitmapScaler_Initialize(IWICBitmapScaler *iface, goto end; } - IWICBitmapSource_AddRef(pISource); - This->source = pISource; - This->width = uiWidth; This->height = uiHeight; This->mode = mode; + hr = IWICBitmapSource_GetSize(pISource, &This->src_width, &This->src_height); + + if (SUCCEEDED(hr)) + hr = IWICBitmapSource_GetPixelFormat(pISource, &src_pixelformat); + + if (SUCCEEDED(hr)) + { + hr = get_pixelformat_bpp(&src_pixelformat, &This->bpp); + } + + if (SUCCEEDED(hr)) + { + switch (mode) + { + default: + FIXME("unsupported mode %i\n", mode); + /* fall-through */ + case WICBitmapInterpolationModeNearestNeighbor: + if ((This->bpp % 8) == 0) + { + IWICBitmapSource_AddRef(pISource); + This->source = pISource; + } + else + { + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, + pISource, &This->source); + This->bpp = 32; + } + This->fn_get_required_source_rect = NearestNeighbor_GetRequiredSourceRect; + This->fn_copy_scanline = NearestNeighbor_CopyScanline; + break; + } + } + end: LeaveCriticalSection(&This->lock); @@ -224,7 +387,10 @@ HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) This->source = NULL; This->width = 0; This->height = 0; + This->src_width = 0; + This->src_height = 0; This->mode = 0; + This->bpp = 0; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BitmapScaler.lock"); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 815ee3d..a3a7548 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -55,6 +55,8 @@ extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) DECLSPEC_HIDDEN; +extern HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) DECLSPEC_HIDDEN; + extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) DECLSPEC_HIDDEN; extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : windowscodecs: Make sure that stream is not reused once the decoder is initialized.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 39f80e56fb15858e1d057facae56fa7f8527bd80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f80e56fb15858e1d057faca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 15:08:06 2012 +0900 windowscodecs: Make sure that stream is not reused once the decoder is initialized. --- dlls/windowscodecs/imgfactory.c | 77 ++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 38 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index d70c223..c9bba2b 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -121,26 +121,22 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromFilename( return hr; } -static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream( - IWICComponentFactory *iface, IStream *pIStream, const GUID *pguidVendor, - WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) +static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendor, + WICDecodeOptions metadataOptions) { IEnumUnknown *enumdecoders; IUnknown *unkdecoderinfo; IWICBitmapDecoderInfo *decoderinfo; - IWICBitmapDecoder *decoder = NULL, *preferred_decoder = NULL; + IWICBitmapDecoder *decoder = NULL; GUID vendor; - HRESULT res=S_OK; + HRESULT res; ULONG num_fetched; BOOL matches; - TRACE("(%p,%p,%s,%u,%p)\n", iface, pIStream, debugstr_guid(pguidVendor), - metadataOptions, ppIDecoder); - res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); - if (FAILED(res)) return res; + if (FAILED(res)) return NULL; - while (!preferred_decoder) + while (!decoder) { res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); @@ -150,40 +146,34 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream( if (SUCCEEDED(res)) { + if (pguidVendor) + { + res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor); + if (FAILED(res) || !IsEqualIID(&vendor, pguidVendor)) + { + IWICBitmapDecoderInfo_Release(decoderinfo); + IUnknown_Release(unkdecoderinfo); + continue; + } + } + res = IWICBitmapDecoderInfo_MatchesPattern(decoderinfo, pIStream, &matches); if (SUCCEEDED(res) && matches) { - IWICBitmapDecoder *new_decoder; - - res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &new_decoder); + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder); /* FIXME: should use QueryCapability to choose a decoder */ if (SUCCEEDED(res)) { - res = IWICBitmapDecoder_Initialize(new_decoder, pIStream, metadataOptions); + res = IWICBitmapDecoder_Initialize(decoder, pIStream, metadataOptions); - if (SUCCEEDED(res)) + if (FAILED(res)) { - if (pguidVendor) - { - res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor); - if (SUCCEEDED(res) && IsEqualIID(&vendor, pguidVendor)) - { - preferred_decoder = new_decoder; - new_decoder = NULL; - } - } - - if (new_decoder && !decoder) - { - decoder = new_decoder; - new_decoder = NULL; - } + IWICBitmapDecoder_Release(decoder); + decoder = NULL; } - - if (new_decoder) IWICBitmapDecoder_Release(new_decoder); } } @@ -198,12 +188,23 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream( IEnumUnknown_Release(enumdecoders); - if (preferred_decoder) - { - *ppIDecoder = preferred_decoder; - if (decoder) IWICBitmapDecoder_Release(decoder); - return S_OK; - } + return decoder; +} + +static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream( + IWICComponentFactory *iface, IStream *pIStream, const GUID *pguidVendor, + WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) +{ + HRESULT res; + IWICBitmapDecoder *decoder = NULL; + + TRACE("(%p,%p,%s,%u,%p)\n", iface, pIStream, debugstr_guid(pguidVendor), + metadataOptions, ppIDecoder); + + if (pguidVendor) + decoder = find_decoder(pIStream, pguidVendor, metadataOptions); + if (!decoder) + decoder = find_decoder(pIStream, NULL, metadataOptions); if (decoder) {

1 0

Dmitry Timoshkov : gdiplus: Comment out a test that crashes some gdiplus implementations.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: bd1adf9e0b22f52e4de47d15b97412b353697ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1adf9e0b22f52e4de47d15b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 17:52:24 2012 +0900 gdiplus: Comment out a test that crashes some gdiplus implementations. --- dlls/gdiplus/tests/image.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 67d0a8b..c373f13 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1786,10 +1786,13 @@ static void test_getsetpixel(void) broken(stat == Ok), /* Older gdiplus */ "Expected InvalidParameter, got %.8x\n", stat); +if (0) /* crashes some gdiplus implementations */ +{ stat = GdipBitmapSetPixel(bitmap, 1, -1, 0); ok(stat == InvalidParameter || broken(stat == Ok), /* Older gdiplus */ "Expected InvalidParameter, got %.8x\n", stat); +} stat = GdipBitmapGetPixel(bitmap, 2, 1, &color); expect(InvalidParameter, stat);

1 0

Owen Rudge : msvcp90: Add initial basic_stringbuf<char> implementation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 0d1009b3c1bda5f8b56099dafa1d1fa7c9542a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1009b3c1bda5f8b56099daf… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jun 28 11:32:47 2012 +0100 msvcp90: Add initial basic_stringbuf<char> implementation. --- dlls/msvcp90/ios.c | 267 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/msvcp90.spec | 58 +++++----- 3 files changed, 298 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d1009b3c1bda5f8b5609…

1 0