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

Erich Hoover : hhctrl.ocx: Keep parsing failure from causing a segmentation fault.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: b72ac222ea8b59eae17efbdff57cbfd82e3badd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72ac222ea8b59eae17efbdff… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Jun 25 08:54:47 2012 -0600 hhctrl.ocx: Keep parsing failure from causing a segmentation fault. --- dlls/hhctrl.ocx/index.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 3cf69de..2cc79a6 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -191,6 +191,8 @@ static IndexItem *parse_li(HHInfo *info, stream_t *stream) strbuf_zero(&node); } + if(!ret) + FIXME("Failed to parse <li> tag!\n"); strbuf_free(&node); strbuf_free(&node_name); @@ -227,9 +229,11 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) if(!strcasecmp(node_name.buf, "li")) { item->next = parse_li(info, &stream); - item->next->merge = item->merge; - item = item->next; - item->indentLevel = indent_level; + if(item->next) { + item->next->merge = item->merge; + item = item->next; + item->indentLevel = indent_level; + } }else if(!strcasecmp(node_name.buf, "ul")) { indent_level++; }else if(!strcasecmp(node_name.buf, "/ul")) {

1 0

Dmitry Timoshkov : gdiplus: When loading a bitmap frame save its IWICMetadataReader interface.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: b72d236ca8eb3994bcb1023eeb215513cb347721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72d236ca8eb3994bcb1023ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 20:30:34 2012 +0900 gdiplus: When loading a bitmap frame save its IWICMetadataReader interface. --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/image.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9ac9be2..1f50c91 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -29,6 +29,7 @@ #include "objbase.h" #include "ocidl.h" +#include "wincodecsdk.h" #include "wine/list.h" #include "gdiplus.h" @@ -309,6 +310,7 @@ struct GpBitmap{ INT stride; /* stride of bits if this is a DIB */ BYTE *own_bits; /* image bits that need to be freed with this object */ INT lockx, locky; /* X and Y coordinates of the rect when a bitmap is locked for writing. */ + IWICMetadataReader *metadata_reader; /* NULL if there is no metadata */ }; struct GpCachedBitmap{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 351160b..c8650c6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define NONAMELESSUNION @@ -1785,6 +1786,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->bits = bits; (*bitmap)->stride = stride; (*bitmap)->own_bits = own_bits; + (*bitmap)->metadata_reader = NULL; /* set format-related flags */ if (format & (PixelFormatAlpha|PixelFormatPAlpha|PixelFormatIndexed)) @@ -1967,6 +1969,11 @@ GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE hemf, UINT cbData16, * and free src. */ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) { + assert(src->image.type == ImageTypeBitmap); + assert(dst->image.type == ImageTypeBitmap); + assert(src->image.stream == NULL); + assert(dst->image.stream == NULL); + GdipFree(dst->bitmapbits); DeleteDC(dst->hdc); DeleteObject(dst->hbitmap); @@ -1991,7 +1998,11 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) dst->bits = src->bits; dst->stride = src->stride; dst->own_bits = src->own_bits; + if (dst->metadata_reader) + IWICMetadataReader_Release(dst->metadata_reader); + dst->metadata_reader = src->metadata_reader; + src->image.type = ~0; GdipFree(src); } @@ -2006,6 +2017,8 @@ static GpStatus free_image_data(GpImage *image) GdipFree(((GpBitmap*)image)->own_bits); DeleteDC(((GpBitmap*)image)->hdc); DeleteObject(((GpBitmap*)image)->hbitmap); + if (((GpBitmap*)image)->metadata_reader) + IWICMetadataReader_Release(((GpBitmap*)image)->metadata_reader); } else if (image->type == ImageTypeMetafile) { @@ -2588,6 +2601,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; IWICBitmapSource *source=NULL; + IWICMetadataBlockReader *block_reader; WICPixelFormatGUID wic_format; PixelFormat gdip_format=0; int i; @@ -2685,6 +2699,15 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICBitmapSource_Release(source); } + bitmap->metadata_reader = NULL; + if (IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader) == S_OK) + { + UINT block_count = 0; + if (IWICMetadataBlockReader_GetCount(block_reader, &block_count) == S_OK && block_count) + IWICMetadataBlockReader_GetReaderByIndex(block_reader, 0, &bitmap->metadata_reader); + IWICMetadataBlockReader_Release(block_reader); + } + IWICBitmapFrameDecode_Release(frame); }

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetPropertyCount.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: b9132b68153c509be1ece76bd760db5eb9a97731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9132b68153c509be1ece76bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 20:30:43 2012 +0900 gdiplus: Implement GdipGetPropertyCount. --- dlls/gdiplus/image.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c8650c6..33c6ee6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2403,16 +2403,20 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, return InvalidParameter; } -GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage *image, UINT* num) +GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage *image, UINT *num) { - static int calls; - TRACE("(%p, %p)\n", image, num); - if(!(calls++)) - FIXME("not implemented\n"); + if (!image || !num) return InvalidParameter; *num = 0; + + if (image->type == ImageTypeBitmap) + { + if (((GpBitmap *)image)->metadata_reader) + IWICMetadataReader_GetCount(((GpBitmap *)image)->metadata_reader, num); + } + return Ok; }

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetPropertyIdList.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: fb6b27de77e5994f0f5105d38264670d447b6241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6b27de77e5994f0f5105d38… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 20:30:50 2012 +0900 gdiplus: Implement GdipGetPropertyIdList. --- dlls/gdiplus/image.c | 53 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 33c6ee6..db4518a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2420,16 +2420,59 @@ GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage *image, UINT *num) return Ok; } -GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID* list) +GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list) { - static int calls; + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + UINT prop_count, i, items_returned; TRACE("(%p, %u, %p)\n", image, num, list); - if(!(calls++)) - FIXME("not implemented\n"); + if (!image || !list) return InvalidParameter; - return InvalidParameter; + if (image->type != ImageTypeBitmap) + { + FIXME("Not implemented for type %d\n", image->type); + return NotImplemented; + } + + reader = ((GpBitmap *)image)->metadata_reader; + if (!reader) + { + if (num != 0) return InvalidParameter; + return Ok; + } + + hr = IWICMetadataReader_GetCount(reader, &prop_count); + if (FAILED(hr)) return hresult_to_status(hr); + + if (num != prop_count) return InvalidParameter; + + hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); + if (FAILED(hr)) return hresult_to_status(hr); + + IWICEnumMetadataItem_Reset(enumerator); + + for (i = 0; i < num; i++) + { + PROPVARIANT id; + + hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, NULL, &items_returned); + if (hr != S_OK) break; + + if (id.vt != VT_UI2) + { + FIXME("not supported propvariant type for id: %u\n", id.vt); + list[i] = 0; + continue; + } + list[i] = id.u.uiVal; + } + + IWICEnumMetadataItem_Release(enumerator); + + return hr == S_OK ? Ok : hresult_to_status(hr); } GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID id, UINT size,

1 0

Dmitry Timoshkov : gdiplus: Add some tests for image properties.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 7f9230c5667c4038199d2b39c7aeb252abb6e793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9230c5667c4038199d2b39c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 20:30:57 2012 +0900 gdiplus: Add some tests for image properties. --- dlls/gdiplus/tests/image.c | 115 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 84baaa3..40673a0 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -27,8 +27,8 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok((UINT)(got) == (UINT)(expected), "Expected %.8x, got %.8x\n", (UINT)(expected), (UINT)(got)) -#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +#define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (expected), (got)) +#define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) static BOOL color_match(ARGB c1, ARGB c2, BYTE max_diff) { @@ -2656,6 +2656,116 @@ static void test_dispose(void) expect(ObjectBusy, stat); } +static GpImage *load_image(const BYTE *image_data, UINT image_size) +{ + IStream *stream; + HGLOBAL hmem; + BYTE *data; + HRESULT hr; + GpStatus status; + GpImage *image = NULL; + + hmem = GlobalAlloc(0, image_size); + data = GlobalLock(hmem); + memcpy(data, image_data, image_size); + GlobalUnlock(hmem); + + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + if (hr != S_OK) return NULL; + + status = GdipLoadImageFromStream(stream, &image); + ok(status == Ok, "GdipLoadImageFromStream error %d\n", status); + + IStream_Release(stream); + + return image; +} + +static void test_image_properties(void) +{ + static const struct test_data + { + const BYTE *image_data; + UINT image_size; + ImageType image_type; + UINT prop_count; + } + td[] = + { + { pngimage, sizeof(pngimage), ImageTypeBitmap, 4 }, + /* Win7 reports 4 properties, while everybody else just 1 + { gifimage, sizeof(gifimage), ImageTypeBitmap, 1 }, */ + { jpgimage, sizeof(jpgimage), ImageTypeBitmap, 2 }, + { tiffimage, sizeof(tiffimage), ImageTypeBitmap, 16 }, + { bmpimage, sizeof(bmpimage), ImageTypeBitmap, 0 }, + { wmfimage, sizeof(wmfimage), ImageTypeMetafile, 0 } + }; + GpStatus status; + GpImage *image; + UINT prop_count, i; + PROPID prop_id[16]; + ImageType image_type; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + image = load_image(td[i].image_data, td[i].image_size); + ok(image != 0, "%u: failed to load image data\n", i); + if (!image) continue; + + status = GdipGetImageType(image, &image_type); + ok(status == Ok, "%u: GdipGetImageType error %d\n", i, status); + ok(td[i].image_type == image_type, "%u: expected image_type %d, got %d\n", + i, td[i].image_type, image_type); + + status = GdipGetPropertyCount(image, &prop_count); + ok(status == Ok, "%u: GdipGetPropertyCount error %d\n", i, status); + if (td[i].image_data == pngimage || td[i].image_data == gifimage || + td[i].image_data == jpgimage) + todo_wine + ok(td[i].prop_count == prop_count, " %u: expected property count %u, got %u\n", + i, td[i].prop_count, prop_count); + else + ok(td[i].prop_count == prop_count, " %u: expected property count %u, got %u\n", + i, td[i].prop_count, prop_count); + + if (td[i].prop_count != prop_count) + { + GdipDisposeImage(image); + continue; + } + + status = GdipGetPropertyIdList(NULL, prop_count, prop_id); + expect(InvalidParameter, status); + status = GdipGetPropertyIdList(image, prop_count, NULL); + expect(InvalidParameter, status); + status = GdipGetPropertyIdList(image, 0, prop_id); + if (image_type == ImageTypeMetafile) + expect(NotImplemented, status); + else if (prop_count == 0) + expect(Ok, status); + else + expect(InvalidParameter, status); + status = GdipGetPropertyIdList(image, prop_count - 1, prop_id); + if (image_type == ImageTypeMetafile) + expect(NotImplemented, status); + else + expect(InvalidParameter, status); + status = GdipGetPropertyIdList(image, prop_count + 1, prop_id); + if (image_type == ImageTypeMetafile) + expect(NotImplemented, status); + else + expect(InvalidParameter, status); + status = GdipGetPropertyIdList(image, prop_count, prop_id); + if (image_type == ImageTypeMetafile) + expect(NotImplemented, status); + else + expect(Ok, status); + + GdipDisposeImage(image); + } +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2668,6 +2778,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_image_properties(); test_Scan0(); test_FromGdiDib(); test_GetImageDimension();

1 0

Dmitry Timoshkov : gdiplus: Avoid casting IWICBitmapFrameDecode to IWICBitmapSource.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: d079b66ba5cc5465f4745ff11342fdd285c94906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d079b66ba5cc5465f4745ff11… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 20:31:03 2012 +0900 gdiplus: Avoid casting IWICBitmapFrameDecode to IWICBitmapSource. --- dlls/gdiplus/image.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index db4518a..d6e2a8c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2676,12 +2676,14 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr if (SUCCEEDED(hr)) { + IWICBitmapSource *bmp_source; + IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICBitmapSource, (void **)&bmp_source); + for (i=0; wic_pixel_formats[i]; i++) { if (IsEqualGUID(&wic_format, wic_pixel_formats[i])) { - source = (IWICBitmapSource*)frame; - IWICBitmapSource_AddRef(source); + source = bmp_source; gdip_format = wic_gdip_formats[i]; break; } @@ -2689,8 +2691,9 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr if (!source) { /* unknown format; fall back on 32bppARGB */ - hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)frame, &source); + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, bmp_source, &source); gdip_format = PixelFormat32bppARGB; + IWICBitmapSource_Release(bmp_source); } }

1 0

Piotr Caban : msvcp90: Fix basic_ostream<char>::operator<<(basic_string) export.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 9173de875a903df906f4ea723f4cca26a83701b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9173de875a903df906f4ea723… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 26 14:35:06 2012 +0200 msvcp90: Fix basic_ostream<char>::operator<<(basic_string) export. --- dlls/msvcp90/msvcp90.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a6872f3..d1efc78 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -42,8 +42,8 @@ @ stub -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@PEA_W(a)Z @ cdecl -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_istream_wchar_get_bstr @ cdecl -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_istream_wchar_get_bstr -@ cdecl -arch=win32 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr -@ cdecl -arch=win64 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr +@ cdecl -arch=win32 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr +@ cdecl -arch=win64 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr @ stub -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z @ stub -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z @ stub -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z

1 0

Huw Davies : oleaut32: Add support for boolean strings in VarNot.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: dc1d7868d341a4268bec2c7682a0b7592a48ef52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1d7868d341a4268bec2c768… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 26 13:34:02 2012 +0100 oleaut32: Add support for boolean strings in VarNot. --- dlls/oleaut32/tests/vartest.c | 4 ++++ dlls/oleaut32/variant.c | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 770ea5f..1ac09cd 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2007,6 +2007,8 @@ static void test_VarNot(void) { static const WCHAR szNum0[] = {'0','\0' }; static const WCHAR szNum1[] = {'1','\0' }; + static const WCHAR szFalse[] = { '#','F','A','L','S','E','#','\0' }; + static const WCHAR szTrue[] = { '#','T','R','U','E','#','\0' }; HRESULT hres; VARIANT v, exp, vDst; DECIMAL *pdec = &V_DECIMAL(&v); @@ -2102,6 +2104,8 @@ static void test_VarNot(void) ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) == szNum0, "VarNot(0): changed input\n"); VARNOT(BSTR,(BSTR)szNum1,I4,-2); ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) == szNum1, "VarNot(1): changed input\n"); + VARNOT(BSTR, (BSTR)szTrue, BOOL, VARIANT_FALSE); + VARNOT(BSTR, (BSTR)szFalse, BOOL, VARIANT_TRUE); V_VT(&v) = VT_DECIMAL; S(U(*pdec)).sign = DECIMAL_NEG; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 20df548..2045eab 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5026,6 +5026,19 @@ HRESULT WINAPI VarNot(LPVARIANT pVarIn, LPVARIANT pVarOut) pVarIn = &temp; } + if (V_VT(pVarIn) == VT_BSTR) + { + V_VT(&varIn) = VT_R8; + hRet = VarR8FromStr( V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(&varIn) ); + if (FAILED(hRet)) + { + V_VT(&varIn) = VT_BOOL; + hRet = VarBoolFromStr( V_BSTR(pVarIn), LOCALE_USER_DEFAULT, VAR_LOCALBOOL, &V_BOOL(&varIn) ); + } + if (FAILED(hRet)) goto VarNot_Exit; + pVarIn = &varIn; + } + V_VT(pVarOut) = V_VT(pVarIn); switch (V_VT(pVarIn)) @@ -5066,12 +5079,6 @@ HRESULT WINAPI VarNot(LPVARIANT pVarIn, LPVARIANT pVarOut) V_I4(pVarOut) = ~V_I4(pVarOut); V_VT(pVarOut) = VT_I4; break; - case VT_BSTR: - hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(&varIn)); - if (FAILED(hRet)) - break; - pVarIn = &varIn; - /* Fall through ... */ case VT_DATE: case VT_R8: hRet = VarI4FromR8(V_R8(pVarIn), &V_I4(pVarOut));

1 0

Henri Verbeet : secur32: Handle padding only records in schan_DecryptMessage().
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: e2bd967a856e52251c4ea12cd5413637a8c5d405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bd967a856e52251c4ea12cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 26 15:32:06 2012 +0200 secur32: Handle padding only records in schan_DecryptMessage(). --- dlls/secur32/schannel.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 253e71a..2339b73 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1080,23 +1080,18 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle { SIZE_T length = data_size - received; SECURITY_STATUS status = schan_imp_recv(ctx->session, data + received, &length); + if (status == SEC_I_CONTINUE_NEEDED) - { - if (!received) - { - HeapFree(GetProcessHeap(), 0, data); - TRACE("Returning SEC_E_INCOMPLETE_MESSAGE\n"); - return SEC_E_INCOMPLETE_MESSAGE; - } break; - } - else if (status != SEC_E_OK) + + if (status != SEC_E_OK) { HeapFree(GetProcessHeap(), 0, data); ERR("Returning %d\n", status); return status; } - else if (!length) + + if (!length) break; received += length;

1 0

Henri Verbeet : secur32: We can' t read more than expected_size - 5 in schan_DecryptMessage().
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 8f39fb146a0e6540b219af8b70589dacaed616d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f39fb146a0e6540b219af8b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 26 15:32:07 2012 +0200 secur32: We can't read more than expected_size - 5 in schan_DecryptMessage(). --- dlls/secur32/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 2339b73..f703ab7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1067,7 +1067,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle return SEC_E_INCOMPLETE_MESSAGE; } - data_size = buffer->cbBuffer; + data_size = expected_size - 5; data = HeapAlloc(GetProcessHeap(), 0, data_size); transport.ctx = ctx;

1 0