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

Nikolay Sivov : msxml3: Fix end prefix iteration for SAXXMLReader40.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: f9c3a51fd8f6d74b66d00dd0bffc3b2e1f287510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c3a51fd8f6d74b66d00dd0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 02:29:18 2012 +0400 msxml3: Fix end prefix iteration for SAXXMLReader40. --- dlls/msxml3/saxreader.c | 2 +- dlls/msxml3/tests/saxreader.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index bcc038b..e15f3e6 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -377,7 +377,7 @@ static inline BOOL sax_callback_failed(saxlocator *This, HRESULT hr) /* index value -1 means it tries to loop for a first time */ static inline BOOL iterate_endprefix_index(saxlocator *This, const element_entry *element, int *i) { - if (This->saxreader->version >= MSXML6) + if (This->saxreader->version >= MSXML4) { if (*i == -1) *i = 0; else ++*i; return *i < element->ns_count; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index bf2cd61..4e2bd11 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1844,9 +1844,8 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); - if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40)) - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE); - else if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", FALSE); else ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE);

1 0

André Hentschel : winedbg: Fix parsing table for ARM disassembler.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: ad1d7450d9c960cb27036da6c38a3e588008ab66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1d7450d9c960cb27036da6c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 16 23:52:30 2012 +0200 winedbg: Fix parsing table for ARM disassembler. --- programs/winedbg/be_arm.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index fbf6954..93f12d6 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -102,12 +102,19 @@ static UINT arm_disasm_branch(UINT inst) return 0; } +static UINT arm_disasm_branchreg(UINT inst) +{ + dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); + return 0; +} + static UINT arm_disasm_dataprocessing(UINT inst) { short condcodes = (inst >> 20) & 0x01; short opcode = (inst >> 21) & 0x0f; short immediate = (inst >> 25) & 0x01; short no_op1 = (opcode & 0x0d) == 0x0d; + short no_dst = (opcode & 0x0c) == 0x08; /* check for nop */ if (get_nibble(inst, 3) == 15 /* r15 */ && condcodes == 0 && @@ -118,7 +125,9 @@ static UINT arm_disasm_dataprocessing(UINT inst) } dbg_printf("\n\t%s%s%s", tbl_dataops[opcode], condcodes ? "s" : "", get_cond(inst)); - dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); + if (!no_dst) dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); + else dbg_printf("\t"); + if (no_op1) { if (immediate) @@ -395,9 +404,10 @@ struct inst_arm static const struct inst_arm tbl_arm[] = { { 0x0e000000, 0x0a000000, arm_disasm_branch }, + { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, + { 0x0fffff00, 0x012fff00, arm_disasm_branchreg }, { 0x0c000000, 0x00000000, arm_disasm_dataprocessing }, { 0x0c000000, 0x04000000, arm_disasm_singletrans }, - { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, { 0x0e000000, 0x08000000, arm_disasm_blocktrans }, { 0x0f000000, 0x0f000000, arm_disasm_swi }, { 0x0f000010, 0x0e000010, arm_disasm_coproctrans },

1 0

Nikolay Sivov : msxml3: Added getIndexFromName() implementation for SAXAttributes.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 8dcd01bbeb0b82b8dc28338500ea19f680c080eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcd01bbeb0b82b8dc2833850… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 10:29:34 2012 +0400 msxml3: Added getIndexFromName() implementation for SAXAttributes. --- dlls/msxml3/mxwriter.c | 30 +++++++++++-- dlls/msxml3/tests/saxreader.c | 96 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a5b9684..603517e 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1827,13 +1827,33 @@ static HRESULT WINAPI SAXAttributes_getName(ISAXAttributes *iface, int nIndex, c return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, const WCHAR * pUri, int cUriLength, - const WCHAR * pLocalName, int cocalNameLength, int * index) +static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, const WCHAR *uri, int uri_len, + const WCHAR *name, int len, int *index) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %s:%d %p): stub\n", This, debugstr_wn(pUri, cUriLength), cUriLength, - debugstr_wn(pLocalName, cocalNameLength), cocalNameLength, index); - return E_NOTIMPL; + int i; + + TRACE("(%p)->(%s:%d %s:%d %p)\n", This, debugstr_wn(uri, uri_len), uri_len, + debugstr_wn(name, len), len, index); + + if (!index && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + if (!uri || !name || !index) return E_INVALIDARG; + + for (i = 0; i < This->length; i++) + { + if (uri_len != SysStringLen(This->attr[i].uri)) continue; + if (strncmpW(uri, This->attr[i].uri, uri_len)) continue; + + if (len != SysStringLen(This->attr[i].local)) continue; + if (strncmpW(name, This->attr[i].local, len)) continue; + + *index = i; + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, const WCHAR *qname, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index afe887c..41e3775 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4175,6 +4175,101 @@ static void test_mxattr_qi(void) IVBSAXAttributes_Release(vbsaxattr2); } +static struct msxmlsupported_data_t saxattr_support_data[] = +{ + { &CLSID_SAXAttributes, "SAXAttributes" }, + { &CLSID_SAXAttributes30, "SAXAttributes30" }, + { &CLSID_SAXAttributes40, "SAXAttributes40" }, + { &CLSID_SAXAttributes60, "SAXAttributes60" }, + { NULL } +}; + +static void test_mxattr_localname(void) +{ + static const WCHAR localname1W[] = {'l','o','c','a','l','n','a','m','e','1',0}; + static const WCHAR localnameW[] = {'l','o','c','a','l','n','a','m','e',0}; + static const WCHAR uri1W[] = {'u','r','i','1',0}; + static const WCHAR uriW[] = {'u','r','i',0}; + + const struct msxmlsupported_data_t *table = saxattr_support_data; + + while (table->clsid) + { + ISAXAttributes *saxattr; + IMXAttributes *mxattr; + HRESULT hr; + int index; + + if (!is_clsid_supported(table->clsid, mxattributes_support_data)) + { + table++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXAttributes, (void**)&mxattr); + EXPECT_HR(hr, S_OK); + + hr = IMXAttributes_QueryInterface(mxattr, &IID_ISAXAttributes, (void**)&saxattr); + EXPECT_HR(hr, S_OK); + + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + + /* add some ambiguos attribute names */ + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("localname"), + _bstr_("a:localname"), _bstr_(""), _bstr_("value")); + EXPECT_HR(hr, S_OK); + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("localname"), + _bstr_("b:localname"), _bstr_(""), _bstr_("value")); + EXPECT_HR(hr, S_OK); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localnameW, lstrlenW(localnameW), &index); + EXPECT_HR(hr, S_OK); + ok(index == 0, "%s: got index %d\n", table->name, index); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uri1W, lstrlenW(uri1W), localnameW, lstrlenW(localnameW), &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%s: got index %d\n", table->name, index); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%s: got index %d\n", table->name, index); + + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), NULL); + EXPECT_HR(hr, E_POINTER); + } + else + { + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), NULL, 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, localname1W, lstrlenW(localname1W), &index); + EXPECT_HR(hr, E_INVALIDARG); + + table++; + + ISAXAttributes_Release(saxattr); + IMXAttributes_Release(mxattr); + } +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -4233,6 +4328,7 @@ START_TEST(saxreader) test_mxattr_qi(); test_mxattr_addAttribute(); test_mxattr_clear(); + test_mxattr_localname(); test_mxattr_dispex(); } else

1 0

Nikolay Sivov : msxml3: Added IMXAttributes::clear().
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 6f95c6990af0e009ad43d2cb06e4c3e0629190c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f95c6990af0e009ad43d2cb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 09:32:03 2012 +0400 msxml3: Added IMXAttributes::clear(). --- dlls/msxml3/mxwriter.c | 19 +++++++++++++++++-- dlls/msxml3/tests/saxreader.c | 8 ++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 41979e6..a5b9684 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1665,8 +1665,23 @@ static HRESULT WINAPI MXAttributes_addAttributeFromIndex(IMXAttributes *iface, static HRESULT WINAPI MXAttributes_clear(IMXAttributes *iface) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + int i; + + TRACE("(%p)\n", This); + + for (i = 0; i < This->length; i++) + { + SysFreeString(This->attr[i].qname); + SysFreeString(This->attr[i].local); + SysFreeString(This->attr[i].uri); + SysFreeString(This->attr[i].type); + SysFreeString(This->attr[i].value); + memset(&This->attr[i], 0, sizeof(mxattribute)); + } + + This->length = 0; + + return S_OK; } static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int index) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 4e2bd11..afe887c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4068,6 +4068,9 @@ static void test_mxattr_clear(void) hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); EXPECT_HR(hr, E_INVALIDARG); + hr = IMXAttributes_clear(mxattr); + EXPECT_HR(hr, S_OK); + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("local"), _bstr_("qname"), _bstr_("type"), _bstr_("value")); EXPECT_HR(hr, S_OK); @@ -4094,23 +4097,20 @@ static void test_mxattr_clear(void) ok(!lstrcmpW(ptr, _bstr_("qname")), "got %s\n", wine_dbgstr_w(ptr)); hr = IMXAttributes_clear(mxattr); -todo_wine EXPECT_HR(hr, S_OK); len = -1; hr = ISAXAttributes_getLength(saxattr, &len); EXPECT_HR(hr, S_OK); -todo_wine ok(len == 0, "got %d\n", len); len = -1; ptr = (void*)0xdeadbeef; hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); -todo_wine { EXPECT_HR(hr, E_INVALIDARG); ok(len == -1, "got %d\n", len); ok(ptr == (void*)0xdeadbeef, "got %p\n", ptr); -} + IMXAttributes_Release(mxattr); ISAXAttributes_Release(saxattr); free_bstrs();

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_SetResolution.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 29b0c79e24a64c179a9edf4ccb043575eca59009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b0c79e24a64c179a9edf4cc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 15:57:22 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_SetResolution. --- dlls/windowscodecs/jpegformat.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 57008fd..2ae1fc7 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -728,6 +728,7 @@ typedef struct JpegEncoder { int frame_initialized; int started_compress; UINT width, height; + double xres, yres; const jpeg_compress_format *format; IStream *stream; CRITICAL_SECTION lock; @@ -874,8 +875,23 @@ static HRESULT WINAPI JpegEncoder_Frame_SetSize(IWICBitmapFrameEncode *iface, 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; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->started_compress) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->xres = dpiX; + This->yres = dpiY; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface, @@ -1213,6 +1229,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = 0; This->started_compress = 0; This->width = This->height = 0; + This->xres = This->yres = 0.0; This->format = NULL; This->stream = NULL; InitializeCriticalSection(&This->lock);

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_GetCubeMapSurface ().
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: cae90acb7aa03e0682ce9c5b402d0e98e1f554bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae90acb7aa03e0682ce9c5b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:09 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_GetCubeMapSurface(). --- dlls/d3d8/cubetexture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index c28eeb6..5a3496a 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -285,6 +285,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(IDirect3DCubeT { IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; UINT sub_resource_idx; TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface); @@ -297,7 +298,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(IDirect3DCubeT return D3DERR_INVALIDCALL; } - *surface = wined3d_resource_get_parent(sub_resource); + surface_impl = wined3d_resource_get_parent(sub_resource); + *surface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*surface); wined3d_mutex_unlock();

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_SetPixelFormat.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 68d9ea4d833d1939bdf7b351845b2d0b9a713eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d9ea4d833d1939bdf7b3518… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 15:50:30 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_SetPixelFormat. --- dlls/windowscodecs/jpegformat.c | 45 +++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 0149043..57008fd 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -701,6 +701,21 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +typedef struct jpeg_compress_format { + const WICPixelFormatGUID *guid; + int bpp; + int num_components; + J_COLOR_SPACE color_space; + int swap_rgb; +} jpeg_compress_format; + +static const jpeg_compress_format compress_formats[] = { + { &GUID_WICPixelFormat24bppBGR, 24, 3, JCS_RGB, 1 }, + { &GUID_WICPixelFormat32bppCMYK, 32, 4, JCS_CMYK }, + { &GUID_WICPixelFormat8bppGray, 8, 1, JCS_GRAYSCALE }, + { 0 } +}; + typedef struct JpegEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; @@ -713,6 +728,7 @@ typedef struct JpegEncoder { int frame_initialized; int started_compress; UINT width, height; + const jpeg_compress_format *format; IStream *stream; CRITICAL_SECTION lock; BYTE dest_buffer[1024]; @@ -865,8 +881,32 @@ static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *ifa static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pPixelFormat)); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + int i; + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->started_compress) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + for (i=0; compress_formats[i].guid; i++) + { + if (memcmp(compress_formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!compress_formats[i].guid) i = 0; + + This->format = &compress_formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_SetColorContexts(IWICBitmapFrameEncode *iface, @@ -1173,6 +1213,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = 0; This->started_compress = 0; This->width = This->height = 0; + This->format = NULL; This->stream = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock");

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_Commit.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: df3da729fe14f397f5c75448e5b40a03520bb32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3da729fe14f397f5c75448e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 16:45:25 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_Commit. --- dlls/windowscodecs/jpegformat.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ac11654..cd453cf 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -66,6 +66,7 @@ MAKE_FUNCPTR(jpeg_CreateCompress); MAKE_FUNCPTR(jpeg_CreateDecompress); MAKE_FUNCPTR(jpeg_destroy_compress); MAKE_FUNCPTR(jpeg_destroy_decompress); +MAKE_FUNCPTR(jpeg_finish_compress); MAKE_FUNCPTR(jpeg_read_header); MAKE_FUNCPTR(jpeg_read_scanlines); MAKE_FUNCPTR(jpeg_resync_to_restart); @@ -90,6 +91,7 @@ static void *load_libjpeg(void) LOAD_FUNCPTR(jpeg_CreateDecompress); LOAD_FUNCPTR(jpeg_destroy_compress); LOAD_FUNCPTR(jpeg_destroy_decompress); + LOAD_FUNCPTR(jpeg_finish_compress); LOAD_FUNCPTR(jpeg_read_header); LOAD_FUNCPTR(jpeg_read_scanlines); LOAD_FUNCPTR(jpeg_resync_to_restart); @@ -734,6 +736,7 @@ typedef struct JpegEncoder { int frame_initialized; int started_compress; int lines_written; + int frame_committed; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -1066,8 +1069,33 @@ static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + jmp_buf jmpbuf; + TRACE("(%p)\n", iface); + + EnterCriticalSection(&This->lock); + + if (!This->started_compress || This->lines_written != This->height || This->frame_committed) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + LeaveCriticalSection(&This->lock); + return E_FAIL; + } + This->cinfo.client_data = &jmpbuf; + + pjpeg_finish_compress(&This->cinfo); + + This->frame_committed = TRUE; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, @@ -1333,6 +1361,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = 0; This->started_compress = 0; This->lines_written = 0; + This->frame_committed = 0; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_WritePixels.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 20521a5bb70cfdfb25d8daf48f2e7d4d0079f4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=20521a5bb70cfdfb25d8daf48… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 16:37:56 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_WritePixels. --- dlls/windowscodecs/jpegformat.c | 109 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 2ae1fc7..ac11654 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -69,8 +69,11 @@ MAKE_FUNCPTR(jpeg_destroy_decompress); MAKE_FUNCPTR(jpeg_read_header); MAKE_FUNCPTR(jpeg_read_scanlines); MAKE_FUNCPTR(jpeg_resync_to_restart); +MAKE_FUNCPTR(jpeg_set_defaults); +MAKE_FUNCPTR(jpeg_start_compress); MAKE_FUNCPTR(jpeg_start_decompress); MAKE_FUNCPTR(jpeg_std_error); +MAKE_FUNCPTR(jpeg_write_scanlines); #undef MAKE_FUNCPTR static void *load_libjpeg(void) @@ -90,8 +93,11 @@ static void *load_libjpeg(void) LOAD_FUNCPTR(jpeg_read_header); LOAD_FUNCPTR(jpeg_read_scanlines); LOAD_FUNCPTR(jpeg_resync_to_restart); + LOAD_FUNCPTR(jpeg_set_defaults); + LOAD_FUNCPTR(jpeg_start_compress); LOAD_FUNCPTR(jpeg_start_decompress); LOAD_FUNCPTR(jpeg_std_error); + LOAD_FUNCPTR(jpeg_write_scanlines); #undef LOAD_FUNCPTR } return libjpeg_handle; @@ -727,6 +733,7 @@ typedef struct JpegEncoder { int frame_count; int frame_initialized; int started_compress; + int lines_written; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -949,8 +956,105 @@ static HRESULT WINAPI JpegEncoder_Frame_SetThumbnail(IWICBitmapFrameEncode *ifac 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; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + jmp_buf jmpbuf; + BYTE *swapped_data = NULL, *current_row; + int line, row_size; + TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || !This->width || !This->height || !This->format) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + if (lineCount == 0 || lineCount + This->lines_written > This->height) + { + LeaveCriticalSection(&This->lock); + return E_INVALIDARG; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + return E_FAIL; + } + This->cinfo.client_data = &jmpbuf; + + if (!This->started_compress) + { + This->cinfo.image_width = This->width; + This->cinfo.image_height = This->height; + This->cinfo.input_components = This->format->num_components; + This->cinfo.in_color_space = This->format->color_space; + + pjpeg_set_defaults(&This->cinfo); + + if (This->xres != 0.0 && This->yres != 0.0) + { + This->cinfo.density_unit = 1; /* dots per inch */ + This->cinfo.X_density = This->xres; + This->cinfo.Y_density = This->yres; + } + + pjpeg_start_compress(&This->cinfo, TRUE); + + This->started_compress = 1; + } + + row_size = This->format->bpp / 8 * This->width; + + if (This->format->swap_rgb) + { + swapped_data = HeapAlloc(GetProcessHeap(), 0, row_size); + if (!swapped_data) + { + LeaveCriticalSection(&This->lock); + return E_OUTOFMEMORY; + } + } + + for (line=0; line < lineCount; line++) + { + if (This->format->swap_rgb) + { + int x; + + memcpy(swapped_data, pbPixels + (cbStride * line), row_size); + + for (x=0; x < This->width; x++) + { + BYTE b; + + b = swapped_data[x*3]; + swapped_data[x*3] = swapped_data[x*3+2]; + swapped_data[x*3+2] = b; + } + + current_row = swapped_data; + } + else + current_row = pbPixels + (cbStride * line); + + if (!pjpeg_write_scanlines(&This->cinfo, &current_row, 1)) + { + ERR("failed writing scanlines\n"); + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + return E_FAIL; + } + + This->lines_written++; + } + + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface, @@ -1228,6 +1332,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_count = 0; This->frame_initialized = 0; This->started_compress = 0; + This->lines_written = 0; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Commit.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 4b9fabefd4575e97057fa71a33aa0ef93d6ead8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9fabefd4575e97057fa71a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 17:15:48 2012 -0500 windowscodecs: Implement JpegEncoder_Commit. --- 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 cd453cf..3a9b095 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -737,6 +737,7 @@ typedef struct JpegEncoder { int started_compress; int lines_written; int frame_committed; + int committed; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -1306,8 +1307,22 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI JpegEncoder_Commit(IWICBitmapEncoder *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + TRACE("(%p)\n", iface); + + EnterCriticalSection(&This->lock); + + if (!This->frame_committed || This->committed) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->committed = TRUE; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, @@ -1362,6 +1377,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->started_compress = 0; This->lines_written = 0; This->frame_committed = 0; + This->committed = 0; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0