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

Dan Kegel : gdi32: Add test for SelectClipRgn in metafiles, make it pass.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: b85270e3a57df29c49974cbc3616cef7bf62a62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85270e3a57df29c49974cbc3… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Jun 19 18:08:07 2012 -0700 gdi32: Add test for SelectClipRgn in metafiles, make it pass. --- dlls/gdi32/mfdrv/graphics.c | 6 +- dlls/gdi32/tests/metafile.c | 125 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 439fca5..e26076f 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -321,9 +321,9 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) mr->rdParm[0] = 0; mr->rdParm[1] = 6; - mr->rdParm[2] = 0x1234; + mr->rdParm[2] = 0x2f6; mr->rdParm[3] = 0; - mr->rdParm[4] = (Param - mr->rdParm) * sizeof(WORD); + mr->rdParm[4] = (Param - &mr->rdFunction) * sizeof(WORD); mr->rdParm[5] = Bands; mr->rdParm[6] = MaxBands; mr->rdParm[7] = rgndata->rdh.rcBound.left; @@ -413,7 +413,7 @@ INT MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) if (!hrgn) return NULLREGION; iRgn = MFDRV_CreateRegion( dev, hrgn ); if(iRgn == -1) return ERROR; - ret = MFDRV_MetaParam1( dev, META_SELECTCLIPREGION, iRgn ) ? NULLREGION : ERROR; + ret = MFDRV_MetaParam1( dev, META_SELECTOBJECT, iRgn ) ? NULLREGION : ERROR; MFDRV_MetaParam1( dev, META_DELETEOBJECT, iRgn ); MFDRV_RemoveHandle( dev, iRgn ); return ret; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index df263c3..e6bab5d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2492,6 +2492,124 @@ todo_wine DeleteDC(hdc); } +static const unsigned char MF_CLIP_BITS[] = { + /* METAHEADER */ + 0x01, 0x00, /* mtType */ + 0x09, 0x00, /* mtHeaderSize */ + 0x00, 0x03, /* mtVersion */ + 0x32, 0x00, 0x00, 0x00, /* mtSize */ + 0x01, 0x00, /* mtNoObjects */ + 0x14, 0x00, 0x00, 0x00, /* mtMaxRecord (size in words of longest record) */ + 0x00, 0x00, /* reserved */ + + /* METARECORD for CreateRectRgn(0x11, 0x22, 0x33, 0x44) */ + 0x14, 0x00, 0x00, 0x00, /* rdSize in words */ + 0xff, 0x06, /* META_CREATEREGION */ + 0x00, 0x00, 0x06, 0x00, 0xf6, 0x02, 0x00, 0x00, + 0x24, 0x00, 0x01, 0x00, 0x02, 0x00, 0x11, 0x00, + 0x22, 0x00, 0x33, 0x00, 0x44, 0x00, 0x02, 0x00, + 0x22, 0x00, 0x44, 0x00, 0x11, 0x00, 0x33, 0x00, + 0x02, 0x00, + + /* METARECORD for SelectObject */ + 0x04, 0x00, 0x00, 0x00, + 0x2d, 0x01, /* META_SELECTOBJECT (not META_SELECTCLIPREGION?!) */ + 0x00, 0x00, + + /* METARECORD */ + 0x04, 0x00, 0x00, 0x00, + 0xf0, 0x01, /* META_DELETEOBJECT */ + 0x00, 0x00, + + /* METARECORD for MoveTo(1,0x30) */ + 0x05, 0x00, 0x00, 0x00, /* rdSize in words */ + 0x14, 0x02, /* META_MOVETO */ + 0x30, 0x00, /* y */ + 0x01, 0x00, /* x */ + + /* METARECORD for LineTo(0x20, 0x30) */ + 0x05, 0x00, 0x00, 0x00, /* rdSize in words */ + 0x13, 0x02, /* META_LINETO */ + 0x30, 0x00, /* y */ + 0x20, 0x00, /* x */ + + /* EOF */ + 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00 +}; + +static int clip_mf_enum_proc_seen_selectclipregion; +static int clip_mf_enum_proc_seen_selectobject; + +static int CALLBACK clip_mf_enum_proc(HDC hdc, HANDLETABLE *handle_table, + METARECORD *mr, int n_objs, LPARAM param) +{ + switch (mr->rdFunction) { + case META_SELECTCLIPREGION: + clip_mf_enum_proc_seen_selectclipregion++; + break; + case META_SELECTOBJECT: + clip_mf_enum_proc_seen_selectobject++; + break; + } + return 1; +} + +static void test_mf_clipping(void) +{ + /* left top right bottom */ + static RECT rc_clip = { 0x11, 0x22, 0x33, 0x44 }; + HWND hwnd; + HDC hdc; + HMETAFILE hmf; + HRGN hrgn; + INT ret; + + SetLastError(0xdeadbeef); + hdc = CreateMetaFileA(NULL); + ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); + + hrgn = CreateRectRgn(rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); + ret = SelectClipRgn(hdc, hrgn); + /* Seems like it should be SIMPLEREGION, but windows returns NULLREGION? */ + ok(ret == NULLREGION, "expected NULLREGION, got %d\n", ret); + + /* Draw a line that starts off left of the clip region and ends inside it */ + MoveToEx(hdc, 0x1, 0x30, NULL); + LineTo(hdc, 0x20, 0x30); + + SetLastError(0xdeadbeef); + hmf = CloseMetaFile(hdc); + ok(hmf != 0, "CloseMetaFile error %d\n", GetLastError()); + + if (compare_mf_bits(hmf, MF_CLIP_BITS, sizeof(MF_CLIP_BITS), + "mf_clipping") != 0) + { + dump_mf_bits(hmf, "mf_clipping"); + } + + DeleteObject(hrgn); + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA error %d\n", GetLastError()); + + hdc = GetDC(hwnd); + + ret = EnumMetaFile(hdc, hmf, clip_mf_enum_proc, (LPARAM)&rc_clip); + ok(ret, "EnumMetaFile error %d\n", GetLastError()); + + /* Oddly, windows doesn't seem to use META_SELECTCLIPREGION */ + ok(clip_mf_enum_proc_seen_selectclipregion == 0, + "expected 0 selectclipregion, saw %d\n", clip_mf_enum_proc_seen_selectclipregion); + ok(clip_mf_enum_proc_seen_selectobject == 1, + "expected 1 selectobject, saw %d\n", clip_mf_enum_proc_seen_selectobject); + + DeleteMetaFile(hmf); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); +} + static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, INT nObj, LPARAM lpData) { LPMETAFILEPICT lpMFP = (LPMETAFILEPICT)lpData; @@ -3205,6 +3323,9 @@ START_TEST(metafile) test_SaveDC(); test_emf_BitBlt(); test_emf_DCBrush(); + test_emf_ExtTextOut_on_path(); + test_emf_clipping(); + test_emf_polybezier(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -3215,9 +3336,7 @@ START_TEST(metafile) test_CopyMetaFile(); test_SetMetaFileBits(); test_mf_ExtTextOut_on_path(); - test_emf_ExtTextOut_on_path(); - test_emf_clipping(); - test_emf_polybezier(); + test_mf_clipping(); /* For metafile conversions */ test_mf_conversions();

1 0

Dmitry Timoshkov : gdiplus: Implement GdipImageSelectActiveFrame.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 755c19f3e710147f998a6278d369cc1d15f7d5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755c19f3e710147f998a6278d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 20 13:45:39 2012 +0900 gdiplus: Implement GdipImageSelectActiveFrame. --- dlls/gdiplus/image.c | 114 ++++++++++++++++++++++++++++++++++++------- dlls/gdiplus/tests/image.c | 4 +- 2 files changed, 97 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7da052f..52b3750 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1995,10 +1995,8 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) GdipFree(src); } -GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) +static GpStatus free_image_data(GpImage *image) { - TRACE("%p\n", image); - if(!image) return InvalidParameter; @@ -2033,6 +2031,18 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) if (image->stream) IStream_Release(image->stream); GdipFree(image->palette_entries); + + return Ok; +} + +GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) +{ + GpStatus status; + + TRACE("%p\n", image); + + status = free_image_data(image); + if (status != Ok) return status; image->type = ~0; GdipFree(image); @@ -2522,22 +2532,6 @@ GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage* image, return Ok; } -GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, - GDIPCONST GUID* dimensionID, UINT frameidx) -{ - static int calls; - - TRACE("(%p, %s, %u)\n", image, debugstr_guid(dimensionID), frameidx); - - if(!image || !dimensionID) - return InvalidParameter; - - if(!(calls++)) - FIXME("not implemented\n"); - - return Ok; -} - GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, GpImage **image) { @@ -2862,6 +2856,88 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res return GenericError; } +GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *dimensionID, + UINT frame) +{ + GpStatus stat; + LARGE_INTEGER seek; + HRESULT hr; + const struct image_codec *codec = NULL; + IStream *stream; + GpImage *new_image; + + TRACE("(%p,%s,%u)\n", image, debugstr_guid(dimensionID), frame); + + if (!image || !dimensionID) + return InvalidParameter; + + if (frame >= image->frame_count) + return InvalidParameter; + + if (image->type != ImageTypeBitmap && image->type != ImageTypeMetafile) + { + WARN("invalid image type %d\n", image->type); + return InvalidParameter; + } + + if (image->current_frame == frame) + return Ok; + + if (!image->stream) + { + TRACE("image doesn't have an associated stream\n"); + return Ok; + } + + hr = IStream_Clone(image->stream, &stream); + if (FAILED(hr)) + { + STATSTG statstg; + + hr = IStream_Stat(image->stream, &statstg, STATFLAG_NOOPEN); + if (FAILED(hr)) return hresult_to_status(hr); + + stat = GdipCreateStreamOnFile(statstg.pwcsName, GENERIC_READ, &stream); + if (stat != Ok) return stat; + } + + /* choose an appropriate image decoder */ + stat = get_decoder_info(stream, &codec); + if (stat != Ok) + { + IStream_Release(stream); + return stat; + } + + /* seek to the start of the stream */ + seek.QuadPart = 0; + hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) + { + IStream_Release(stream); + return hresult_to_status(hr); + } + + /* call on the image decoder to do the real work */ + stat = codec->decode_func(stream, &codec->info.Clsid, frame, &new_image); + + if (stat == Ok) + { + memcpy(&new_image->format, &codec->info.FormatID, sizeof(GUID)); + free_image_data(image); + if (image->type == ImageTypeBitmap) + *(GpBitmap *)image = *(GpBitmap *)new_image; + else if (image->type == ImageTypeMetafile) + *(GpMetafile *)image = *(GpMetafile *)new_image; + new_image->type = ~0; + GdipFree(new_image); + return Ok; + } + + IStream_Release(stream); + return stat; +} + GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *source, GpImage **image) { GpStatus stat; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 635b633..84baaa3 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2307,7 +2307,7 @@ static void test_multiframegif(void) color = 0xdeadbeef; GdipBitmapGetPixel(bmp, 0, 0, &color); expect(Ok, stat); - todo_wine expect(0xff000000, color); + expect(0xff000000, color); stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 0); expect(Ok, stat); @@ -2338,7 +2338,7 @@ static void test_multiframegif(void) stat = GdipBitmapGetPixel(bmp, 0, 0, &color); expect(Ok, stat); - todo_wine expect(0xffffffff, color); + expect(0xffffffff, color); GdipDisposeImage((GpImage*)bmp); IStream_Release(stream);

1 0

Dmitry Timoshkov : windowscodecs: Add MetadataReaderInfo implementation.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 8802a9a84cacc381507c752822ae33d5bfd0dcf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8802a9a84cacc381507c75282… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 20 13:59:56 2012 +0900 windowscodecs: Add MetadataReaderInfo implementation. --- dlls/windowscodecs/info.c | 258 +++++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/info.c | 18 ++- 2 files changed, 269 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8802a9a84cacc381507c7…

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataHandler_GetMetadataHandlerInfo.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 27743c81a9ef2fe80c677891dba25e51cb0527d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27743c81a9ef2fe80c677891d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 20 14:00:08 2012 +0900 windowscodecs: Implement MetadataHandler_GetMetadataHandlerInfo. --- dlls/windowscodecs/info.c | 3 +++ dlls/windowscodecs/metadatahandler.c | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 47cbc85..a2cc1a7 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1618,7 +1618,10 @@ HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) hr = HRESULT_FROM_WIN32(res); } else + { + FIXME("%s is not supported\n", wine_dbgstr_guid(clsid)); hr = E_FAIL; + } RegCloseKey(clsidkey); diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 6433136..80fd32d 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -145,8 +145,20 @@ static HRESULT WINAPI MetadataHandler_GetMetadataFormat(IWICMetadataWriter *ifac static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter *iface, IWICMetadataHandlerInfo **ppIHandler) { - FIXME("(%p,%p): stub\n", iface, ppIHandler); - return E_NOTIMPL; + HRESULT hr; + IWICComponentInfo *component_info; + MetadataHandler *This = impl_from_IWICMetadataWriter(iface); + + TRACE("%p,%p\n", iface, ppIHandler); + + hr = CreateComponentInfo(This->vtable->clsid, &component_info); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(component_info, &IID_IWICMetadataHandlerInfo, + (void **)ppIHandler); + + IWICComponentInfo_Release(component_info); + return hr; } static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataHandler_GetMetadataFormat.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 75a88146338d409489682bbc88cfc54224a93812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a88146338d409489682bbc8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 20 14:00:17 2012 +0900 windowscodecs: Implement MetadataHandler_GetMetadataFormat. --- dlls/windowscodecs/metadatahandler.c | 28 +++++++++++++++++++--------- dlls/windowscodecs/tests/metadata.c | 2 -- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 80fd32d..f8b8fcb 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -133,15 +133,6 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface) return ref; } -static HRESULT WINAPI MetadataHandler_GetMetadataFormat(IWICMetadataWriter *iface, - GUID *pguidMetadataFormat) -{ - if (!pguidMetadataFormat) return E_INVALIDARG; - - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidMetadataFormat)); - return E_NOTIMPL; -} - static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter *iface, IWICMetadataHandlerInfo **ppIHandler) { @@ -161,6 +152,25 @@ static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter return hr; } +static HRESULT WINAPI MetadataHandler_GetMetadataFormat(IWICMetadataWriter *iface, + GUID *pguidMetadataFormat) +{ + HRESULT hr; + IWICMetadataHandlerInfo *metadata_info; + + TRACE("%p,%p\n", iface, pguidMetadataFormat); + + if (!pguidMetadataFormat) return E_INVALIDARG; + + hr = MetadataHandler_GetMetadataHandlerInfo(iface, &metadata_info); + if (FAILED(hr)) return hr; + + hr = IWICMetadataHandlerInfo_GetMetadataFormat(metadata_info, pguidMetadataFormat); + IWICMetadataHandlerInfo_Release(metadata_info); + + return hr; +} + static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface, UINT *pcCount) { diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index cf00f1f..e746c89 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -418,9 +418,7 @@ static void test_metadata_IFD(void) IWICEnumMetadataItem_Release(enumerator); hr = IWICMetadataReader_GetMetadataFormat(reader, &format); -todo_wine ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); -todo_wine ok(IsEqualGUID(&format, &GUID_MetadataFormatIfd), "unexpected format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetMetadataFormat(reader, NULL);

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataHandler_GetValueByIndex .
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 0e55fb682f4f4085e516ef03002fecbe09114e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e55fb682f4f4085e516ef030… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 20 14:00:25 2012 +0900 windowscodecs: Implement MetadataHandler_GetValueByIndex. --- dlls/windowscodecs/metadatahandler.c | 28 +++++++++++++++++++++++++--- dlls/windowscodecs/tests/metadata.c | 6 ------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index f8b8fcb..9f36d65 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -185,10 +185,32 @@ static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface, } static HRESULT WINAPI MetadataHandler_GetValueByIndex(IWICMetadataWriter *iface, - UINT nIndex, PROPVARIANT *pvarSchema, PROPVARIANT *pvarId, PROPVARIANT *pvarValue) + UINT index, PROPVARIANT *schema, PROPVARIANT *id, PROPVARIANT *value) { - FIXME("(%p,%u,%p,%p,%p): stub\n", iface, nIndex, pvarSchema, pvarId, pvarValue); - return E_NOTIMPL; + HRESULT hr = S_OK; + MetadataHandler *This = impl_from_IWICMetadataWriter(iface); + + TRACE("%p,%u,%p,%p,%p\n", iface, index, schema, id, value); + + EnterCriticalSection(&This->lock); + + if (index >= This->item_count) + { + LeaveCriticalSection(&This->lock); + return E_INVALIDARG; + } + + if (schema) + hr = PropVariantCopy(schema, &This->items[index].schema); + + if (SUCCEEDED(hr) && id) + hr = PropVariantCopy(id, &This->items[index].id); + + if (SUCCEEDED(hr) && value) + hr = PropVariantCopy(value, &This->items[index].value); + + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e746c89..3c433bd 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -425,13 +425,7 @@ static void test_metadata_IFD(void) ok(hr == E_INVALIDARG, "GetMetadataFormat should fail\n"); hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, NULL); -todo_wine ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); - if (FAILED(hr)) - { - IWICMetadataReader_Release(reader); - return; - } hr = IWICMetadataReader_GetValueByIndex(reader, count - 1, NULL, NULL, NULL); ok(hr == S_OK, "GetValueByIndex error %#x\n", hr);

1 0

Jacek Caban : jscript: Always store numeric literals as double.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 4cfab07748f4187ea71941ddebd40f890b798dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cfab07748f4187ea71941dde… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 20 11:18:22 2012 +0200 jscript: Always store numeric literals as double. --- dlls/jscript/compile.c | 5 --- dlls/jscript/engine.c | 5 +-- dlls/jscript/engine.h | 2 - dlls/jscript/lex.c | 73 +++++++++++------------------------------------ 4 files changed, 18 insertions(+), 67 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index d3deccd..f3c1df1 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -712,8 +712,6 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) return push_instr_int(ctx, OP_bool, literal->u.bval); case LT_DOUBLE: return push_instr_double(ctx, OP_double, literal->u.dval); - case LT_INT: - return push_instr_int(ctx, OP_int, literal->u.lval); case LT_NULL: return push_instr(ctx, OP_null) ? S_OK : E_OUTOFMEMORY; case LT_STRING: @@ -748,9 +746,6 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st case LT_STRING: *str = compiler_alloc_bstr(ctx, literal->u.wstr); break; - case LT_INT: - *str = int_to_bstr(literal->u.lval); - break; case LT_DOUBLE: return double_to_bstr(literal->u.dval, str); default: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1ed1c97..0b97fdd 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1185,13 +1185,10 @@ static HRESULT interp_int(exec_ctx_t *ctx) static HRESULT interp_double(exec_ctx_t *ctx) { const double arg = get_op_double(ctx); - VARIANT v; TRACE("%lf\n", arg); - V_VT(&v) = VT_R8; - V_R8(&v) = arg; - return stack_push(ctx, &v); + return stack_push_number(ctx, arg); } /* ECMA-262 3rd Edition 7.8.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fabf840..d0dec0d 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -248,7 +248,6 @@ HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,BOOL,jsexcept_t*,VA HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; typedef enum { - LT_INT, LT_DOUBLE, LT_STRING, LT_BOOL, @@ -259,7 +258,6 @@ typedef enum { typedef struct { literal_type_t type; union { - LONG lval; double dval; const WCHAR *wstr; VARIANT_BOOL bval; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 06d0b89..d2b87ac 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -376,16 +376,6 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret, WCHAR endc return tStringLiteral; } -static literal_t *new_int_literal(parser_ctx_t *ctx, LONG l) -{ - literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - - ret->type = LT_INT; - ret->u.lval = l; - - return ret; -} - static literal_t *new_double_literal(parser_ctx_t *ctx, DOUBLE d) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); @@ -410,12 +400,6 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li LONGLONG d, hlp; int exp = 0; - if(ctx->ptr == ctx->end || (!isdigitW(*ctx->ptr) && - *ctx->ptr!='.' && *ctx->ptr!='e' && *ctx->ptr!='E')) { - ERR("Illegal character\n"); - return 0; - } - d = int_part; while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { hlp = d*10 + *(ctx->ptr++) - '0'; @@ -431,18 +415,20 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li ctx->ptr++; } - if(*ctx->ptr == '.') ctx->ptr++; + if(*ctx->ptr == '.') { + ctx->ptr++; - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { - hlp = d*10 + *(ctx->ptr++) - '0'; - if(d>LONGLONG_MAX/10 || hlp<0) - break; + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>LONGLONG_MAX/10 || hlp<0) + break; - d = hlp; - exp--; + d = hlp; + exp--; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) + ctx->ptr++; } - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - ctx->ptr++; if(ctx->ptr < ctx->end && (*ctx->ptr == 'e' || *ctx->ptr == 'E')) { int sign = 1, e = 0; @@ -485,11 +471,6 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) LONG l, d; l = *ctx->ptr++ - '0'; - if(ctx->ptr == ctx->end) { - *literal = new_int_literal(ctx, l); - return tNumericLiteral; - } - if(!l) { if(*ctx->ptr == 'x' || *ctx->ptr == 'X') { if(++ctx->ptr == ctx->end) { @@ -507,42 +488,22 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) return lex_error(ctx, E_FAIL); } - *literal = new_int_literal(ctx, l); + *literal = new_double_literal(ctx, l); return tNumericLiteral; } - if(isdigitW(*ctx->ptr) || is_identifier_char(*ctx->ptr)) { + if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); return lex_error(ctx, E_FAIL); } - *literal = new_int_literal(ctx, 0); - } - - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - { - d = l*10 + *(ctx->ptr)-'0'; - - /* Check for integer overflow */ - if (l > INT_MAX/10 || d < 0) - return parse_double_literal(ctx, l, literal); - - l = d; - ctx->ptr++; - } - - if(ctx->ptr < ctx->end) { - if(*ctx->ptr == '.' || *ctx->ptr == 'e' || *ctx->ptr == 'E') - return parse_double_literal(ctx, l, literal); - - if(is_identifier_char(*ctx->ptr)) { - WARN("unexpected identifier char\n"); - return lex_error(ctx, E_FAIL); + if(isdigitW(*ctx->ptr)) { + FIXME("octal literals not implemented\n"); + return lex_error(ctx, E_NOTIMPL); } } - *literal = new_int_literal(ctx, l); - return tNumericLiteral; + return parse_double_literal(ctx, l, literal); } static int next_token(parser_ctx_t *ctx, void *lval)

1 0

Jacek Caban : jscript: Use num_set_int in array.c.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 7118e6fbbbdd58c2270c45a3a0ba5c323713ef8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7118e6fbbbdd58c2270c45a3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 20 11:18:42 2012 +0200 jscript: Use num_set_int in array.c. --- dlls/jscript/array.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5ff6344..91a7b82 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -97,8 +97,7 @@ static HRESULT set_length(jsdisp_t *obj, jsexcept_t *ei, DWORD length) return S_OK; } - V_VT(&var) = VT_I4; - V_I4(&var) = length; + num_set_int(&var, length); return jsdisp_propput_name(obj, lengthW, &var, ei); } @@ -126,8 +125,7 @@ static HRESULT Array_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP switch(flags) { case DISPATCH_PROPERTYGET: - V_VT(retv) = VT_I4; - V_I4(retv) = This->length; + num_set_int(retv, This->length); break; case DISPATCH_PROPERTYPUT: { DOUBLE len = -1; @@ -448,10 +446,8 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR if(FAILED(hres)) return hres; - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = length+n; - } + if(retv) + num_set_int(retv, length+n); return S_OK; } @@ -909,9 +905,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP } if(SUCCEEDED(hres)) { - V_VT(&v) = VT_I4; - V_I4(&v) = delete_cnt; - + num_set_int(&v, delete_cnt); hres = jsdisp_propput_name(ret_array, lengthW, &v, ei); } } @@ -941,8 +935,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP hres = jsdisp_propput_idx(jsthis, start+i, get_arg(dp,i+2), ei); if(SUCCEEDED(hres)) { - V_VT(&v) = VT_I4; - V_I4(&v) = length-delete_cnt+add_args; + num_set_int(&v, length-delete_cnt+add_args); hres = jsdisp_propput_name(jsthis, lengthW, &v, ei); } @@ -1036,12 +1029,10 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP } if(retv) { - if(ctx->version < 2) { + if(ctx->version < 2) V_VT(retv) = VT_EMPTY; - }else { - V_VT(retv) = VT_I4; - V_I4(retv) = length; - } + else + num_set_int(retv, length); } return S_OK; }

1 0

Dmitry Timoshkov : gdiplus: Add a test for creating a nonexistent font with GdipCreateFontFromLogfont.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: eeb52474c1a04a9f8f75ab7602d4113bae6d0fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb52474c1a04a9f8f75ab760… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 19 12:05:17 2012 +0900 gdiplus: Add a test for creating a nonexistent font with GdipCreateFontFromLogfont. --- dlls/gdiplus/tests/font.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 982db39..03f5769 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -105,6 +105,11 @@ static void test_logfont(void) memset(&lfa, 0, sizeof(LOGFONTA)); memset(&lfa2, 0xff, sizeof(LOGFONTA)); + lstrcpyA(lfa.lfFaceName, "Nonexistent font"); + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + ok(stat == NotTrueTypeFont || broken(stat == FileNotFound), /* before XP */ + "expected NotTrueTypeFont, got %d\n", stat); + /* empty FaceName */ lfa.lfFaceName[0] = 0; stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font);

1 0

Dmitry Timoshkov : gdiplus: GdipCreateFontFromLogfont also returns NotTrueTypeFont for a not present font .
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 3439f286791f9c3947f6a765853e2391e29167e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3439f286791f9c3947f6a7658… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 19 12:05:30 2012 +0900 gdiplus: GdipCreateFontFromLogfont also returns NotTrueTypeFont for a not present font. --- dlls/gdiplus/tests/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 0d31365..3cb33c7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1970,7 +1970,7 @@ static void test_GdipDrawString(void) expect(Ok, status); status = GdipCreateFontFromLogfontA(hdc, &logfont, &fnt); - if (status == FileNotFound) + if (status == NotTrueTypeFont || status == FileNotFound) { skip("Arial not installed.\n"); return;

1 0