September 2012 - Wine-commits

Dmitry Timoshkov : gdiplus: Add more tests for GIF image properties.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: f39c140a88a73b321770fbef954d6af42cbe267d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39c140a88a73b321770fbef9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 21 19:57:08 2012 +0900 gdiplus: Add more tests for GIF image properties. --- dlls/gdiplus/tests/image.c | 81 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a26c4f5..59a5064 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3961,8 +3961,10 @@ static void test_gif_properties(void) GpImage *image; GUID guid; UINT dim_count, frame_count, prop_count, prop_size, i; + UINT total_size, total_count; PROPID *prop_id; PropertyItem *prop_item; + const char *item_data; image = load_image(animatedgif, sizeof(animatedgif)); if (!image) /* XP fails to load this GIF image */ @@ -4003,24 +4005,27 @@ todo_wine status = GdipGetPropertyIdList(image, prop_count, prop_id); expect(Ok, status); + prop_size = 0; for (i = 0; i < prop_count; i++) { - status = GdipGetPropertyItemSize(image, prop_id[i], &prop_size); + UINT size; + status = GdipGetPropertyItemSize(image, prop_id[i], &size); expect(Ok, status); if (status != Ok) break; - ok(prop_size > sizeof(*prop_item), "%u: too small item length %u\n", i, prop_size); + ok(size > sizeof(*prop_item), "%u: too small item length %u\n", i, size); - prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, prop_size); - status = GdipGetPropertyItem(image, prop_id[i], prop_size, prop_item); + prop_size += size; + + prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + status = GdipGetPropertyItem(image, prop_id[i], size, prop_item); expect(Ok, status); ok(prop_item->value == prop_item + 1, "expected item->value %p, got %p\n", prop_item + 1, prop_item->value); ok(td[i].type == prop_item->type, "%u: expected type %u, got %u\n", i, td[i].type, prop_item->type); ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id); - prop_size -= sizeof(*prop_item); - ok(prop_item->length == prop_size, "%u: expected length %u, got %u\n", i, prop_size, prop_item->length); + size -= sizeof(*prop_item); + ok(prop_item->length == size, "%u: expected length %u, got %u\n", i, size, prop_item->length); ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); - ok(td[i].length == prop_size, "%u: expected length %u, got %u\n", i, td[i].length, prop_size); if (td[i].length == prop_item->length) { int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; @@ -4040,6 +4045,68 @@ todo_wine HeapFree(GetProcessHeap(), 0, prop_id); + status = GdipGetPropertySize(NULL, &total_size, &total_count); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, &total_size, NULL); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, NULL, &total_count); + expect(InvalidParameter, status); + status = GdipGetPropertySize(image, NULL, NULL); + expect(InvalidParameter, status); + total_size = 0xdeadbeef; + total_count = 0xdeadbeef; + status = GdipGetPropertySize(image, &total_size, &total_count); + expect(Ok, status); + ok(prop_count == total_count, + "expected total property count %u, got %u\n", prop_count, total_count); + ok(prop_size == total_size, + "expected total property size %u, got %u\n", prop_size, total_size); + + prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); + + status = GdipGetAllPropertyItems(image, 0, prop_count, prop_item); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, 1, prop_item); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, 0, 0, NULL); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size + 1, prop_count, prop_item); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); + expect(Ok, status); + + item_data = (const char *)(prop_item + prop_count); + for (i = 0; i < prop_count; i++) + { + ok(prop_item[i].value == item_data, "%u: expected value %p, got %p\n", + i, item_data, prop_item[i].value); + ok(td[i].type == prop_item[i].type, + "%u: expected type %u, got %u\n", i, td[i].type, prop_item[i].type); + ok(td[i].id == prop_item[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item[i].id); + ok(td[i].length == prop_item[i].length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item[i].length); + if (td[i].length == prop_item[i].length) + { + int match = memcmp(td[i].value, prop_item[i].value, td[i].length) == 0; + ok(match, "%u: data mismatch\n", i); + if (!match) + { + UINT j; + BYTE *data = prop_item[i].value; + printf("id %#x:", prop_item[i].id); + for (j = 0; j < prop_item[i].length; j++) + printf(" %02x", data[j]); + printf("\n"); + } + } + item_data += prop_item[i].length; + } + + HeapFree(GetProcessHeap(), 0, prop_item); + GdipDisposeImage(image); }

1 0

Dmitry Timoshkov : gdiplus: Add an ability to cache bitmap properties and use distinct metadata loaders for different image formats .
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 915df87aa5048734046c9889dba4f2fdf6298c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=915df87aa5048734046c9889d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 21 19:58:20 2012 +0900 gdiplus: Add an ability to cache bitmap properties and use distinct metadata loaders for different image formats. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/image.c | 115 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 109 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d44c969..53f978c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -311,6 +311,8 @@ struct GpBitmap{ 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 */ + UINT prop_count; + PropertyItem *prop_item; /* cached image properties */ }; struct GpCachedBitmap{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b657969..c6018ab 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1911,6 +1911,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->stride = stride; (*bitmap)->own_bits = own_bits; (*bitmap)->metadata_reader = NULL; + (*bitmap)->prop_count = 0; + (*bitmap)->prop_item = NULL; /* set format-related flags */ if (format & (PixelFormatAlpha|PixelFormatPAlpha|PixelFormatIndexed)) @@ -2123,6 +2125,9 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) if (dst->metadata_reader) IWICMetadataReader_Release(dst->metadata_reader); dst->metadata_reader = src->metadata_reader; + GdipFree(dst->prop_item); + dst->prop_item = src->prop_item; + dst->prop_count = src->prop_count; if (dst->image.stream) IStream_Release(dst->image.stream); dst->image.stream = src->image.stream; @@ -2147,6 +2152,7 @@ static GpStatus free_image_data(GpImage *image) DeleteObject(((GpBitmap*)image)->hbitmap); if (((GpBitmap*)image)->metadata_reader) IWICMetadataReader_Release(((GpBitmap*)image)->metadata_reader); + GdipFree(((GpBitmap*)image)->prop_item); } else if (image->type == ImageTypeMetafile) { @@ -2509,6 +2515,12 @@ GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage *image, UINT *num) if (image->type == ImageTypeBitmap) { + if (((GpBitmap *)image)->prop_item) + { + *num = ((GpBitmap *)image)->prop_count; + return Ok; + } + if (((GpBitmap *)image)->metadata_reader) IWICMetadataReader_GetCount(((GpBitmap *)image)->metadata_reader, num); } @@ -2533,6 +2545,18 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list return NotImplemented; } + if (((GpBitmap *)image)->prop_item) + { + if (num != ((GpBitmap *)image)->prop_count) return InvalidParameter; + + for (i = 0; i < num; i++) + { + list[i] = ((GpBitmap *)image)->prop_item[i].id; + } + + return Ok; + } + reader = ((GpBitmap *)image)->metadata_reader; if (!reader) { @@ -2621,6 +2645,22 @@ GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID propid, UINT return NotImplemented; } + if (((GpBitmap *)image)->prop_item) + { + UINT i; + + for (i = 0; i < ((GpBitmap *)image)->prop_count; i++) + { + if (propid == ((GpBitmap *)image)->prop_item[i].id) + { + *size = sizeof(PropertyItem) + ((GpBitmap *)image)->prop_item[i].length; + return Ok; + } + } + + return PropertyNotFound; + } + reader = ((GpBitmap *)image)->metadata_reader; if (!reader) return PropertyNotFound; @@ -2753,6 +2793,27 @@ GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID propid, UINT size return NotImplemented; } + if (((GpBitmap *)image)->prop_item) + { + UINT i; + + for (i = 0; i < ((GpBitmap *)image)->prop_count; i++) + { + if (propid == ((GpBitmap *)image)->prop_item[i].id) + { + if (size != sizeof(PropertyItem) + ((GpBitmap *)image)->prop_item[i].length) + return InvalidParameter; + + *buffer = ((GpBitmap *)image)->prop_item[i]; + buffer->value = buffer + 1; + memcpy(buffer->value, ((GpBitmap *)image)->prop_item[i].value, buffer->length); + return Ok; + } + } + + return PropertyNotFound; + } + reader = ((GpBitmap *)image)->metadata_reader; if (!reader) return PropertyNotFound; @@ -2785,6 +2846,19 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT *size, UINT *count) return NotImplemented; } + if (((GpBitmap *)image)->prop_item) + { + *count = ((GpBitmap *)image)->prop_count; + *size = 0; + + for (i = 0; i < ((GpBitmap *)image)->prop_count; i++) + { + *size += sizeof(PropertyItem) + ((GpBitmap *)image)->prop_item[i].length; + } + + return Ok; + } + reader = ((GpBitmap *)image)->metadata_reader; if (!reader) return PropertyNotFound; @@ -2850,6 +2924,21 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, if (prop_count != count || prop_size != size) return InvalidParameter; + if (((GpBitmap *)image)->prop_item) + { + memcpy(buf, ((GpBitmap *)image)->prop_item, prop_size); + + item_value = (char *)(buf + prop_count); + + for (i = 0; i < prop_count; i++) + { + buf[i].value = item_value; + item_value += buf[i].length; + } + + return Ok; + } + reader = ((GpBitmap *)image)->metadata_reader; if (!reader) return PropertyNotFound; @@ -3011,7 +3100,14 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * return GdipLoadImageFromFile(filename, image); } -static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) +static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame) +{ +} + +typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame); + +static GpStatus decode_image_wic(IStream *stream, GDIPCONST CLSID *clsid, + UINT active_frame, metadata_reader_func metadata_reader, GpImage **image) { GpStatus status=Ok; GpBitmap *bitmap; @@ -3126,7 +3222,10 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr if (SUCCEEDED(hr)) { bitmap->metadata_reader = NULL; - if (IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader) == S_OK) + + if (metadata_reader) + metadata_reader(bitmap, decoder, active_frame); + else 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) @@ -3172,7 +3271,7 @@ end: static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICIcoDecoder, active_frame, image); + return decode_image_wic(stream, &CLSID_WICIcoDecoder, active_frame, NULL, image); } static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) @@ -3180,7 +3279,7 @@ static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, UINT active_fr GpStatus status; GpBitmap* bitmap; - status = decode_image_wic(stream, &CLSID_WICBmpDecoder, active_frame, image); + status = decode_image_wic(stream, &CLSID_WICBmpDecoder, active_frame, NULL, image); bitmap = (GpBitmap*)*image; @@ -3195,22 +3294,22 @@ static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, UINT active_fr static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICJpegDecoder, active_frame, image); + return decode_image_wic(stream, &CLSID_WICJpegDecoder, active_frame, NULL, image); } static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICPngDecoder, active_frame, image); + return decode_image_wic(stream, &CLSID_WICPngDecoder, active_frame, NULL, image); } static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICGifDecoder, active_frame, image); + return decode_image_wic(stream, &CLSID_WICGifDecoder, active_frame, gif_metadata_reader, image); } static GpStatus decode_image_tiff(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICTiffDecoder, active_frame, image); + return decode_image_wic(stream, &CLSID_WICTiffDecoder, active_frame, NULL, image); } static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image)

1 0

Huw Davies : comdlg32: Only copy the valid portion of the structure.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: bdbc45fddd583c9273511419e49ff815c516d8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbc45fddd583c9273511419e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:45 2012 +0100 comdlg32: Only copy the valid portion of the structure. --- dlls/comdlg32/filedlg31.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 4a78958..f0763c5 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -556,8 +556,9 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, OPENFILENAMEW ofnsav; LPOPENFILENAMEW ofnW = lfs->ofnW; WCHAR filename[BUFFILE]; + int copied_size = min( ofnW->lStructSize, sizeof(ofnsav) ); - ofnsav = *ofnW; /* for later restoring */ + memcpy( &ofnsav, ofnW, copied_size ); /* for later restoring */ /* get current file name */ if (path) @@ -591,7 +592,7 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, 0, lfs->lParam ); if (lRet) { - *ofnW = ofnsav; /* restore old state */ + memcpy( ofnW, &ofnsav, copied_size ); /* restore old state */ return FALSE; } }

1 0

Huw Davies : comdlg32: Make the unicode copy the same size as the ansi version.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 914353d3dcf2f554e5cc5294d81499efa81a13d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=914353d3dcf2f554e5cc5294d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:46 2012 +0100 comdlg32: Make the unicode copy the same size as the ansi version. --- dlls/comdlg32/filedlg31.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index f0763c5..dcef99e 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -758,7 +758,6 @@ static void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, { UNICODE_STRING usBuffer; - ofnW->lStructSize = sizeof(OPENFILENAMEW); ofnW->hwndOwner = ofnA->hwndOwner; ofnW->hInstance = ofnA->hInstance; if (ofnA->lpstrFilter) @@ -935,7 +934,8 @@ static PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) if (lfs->ofnA->Flags & OFN_ENABLEHOOK) if (lfs->ofnA->lpfnHook) lfs->hook = TRUE; - lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lfs->ofnW)); + lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lfs->ofnA->lStructSize); + lfs->ofnW->lStructSize = lfs->ofnA->lStructSize; FD31_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open); }

1 0

Huw Davies : comdlg32/tests: Explicitly set the structure size to the nt40 version size.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 37975ba776de3d45c5a73d7ba4476881e0d9f1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=37975ba776de3d45c5a73d7ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:47 2012 +0100 comdlg32/tests: Explicitly set the structure size to the nt40 version size. --- dlls/comdlg32/tests/filedlg.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index c9bf52a..b701956 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -93,7 +93,7 @@ static void test_DialogCancel(void) ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.hwndOwner = NULL; ofn.lpstrFilter = "Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"; ofn.lpstrFile = szFileName; @@ -266,7 +266,7 @@ static void test_create_view_window2(void) char filename[1024] = {0}; DWORD ret; - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = create_view_window2_hook; @@ -283,7 +283,7 @@ static void test_create_view_template(void) char filename[1024] = {0}; DWORD ret; - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; @@ -531,7 +531,7 @@ todo_wine static void test_resize(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; DWORD ret; int i; @@ -633,7 +633,7 @@ static LONG_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARA static void test_ok(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; char tmpfilename[ MAX_PATH]; char curdir[MAX_PATH]; @@ -843,7 +843,7 @@ static void test_arrange(void) return; } - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = (LPOFNHOOKPROC)template_hook_arrange; @@ -916,7 +916,7 @@ static void test_getfolderpath(void) ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.hwndOwner = NULL; ofn.lpstrFilter = "Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"; ofn.lpstrFile = szFileName; @@ -948,7 +948,7 @@ static void test_resizable2(void) skip( "some interactive resizable dialog tests (set WINETEST_INTERACTIVE=1)\n"); return; } - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = NULL; @@ -983,7 +983,7 @@ static void test_resizable2(void) static void test_mru(void) { ok_wndproc_testcase testcase = {0}; - OPENFILENAME ofn = {sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; const char *test_dir_name = "C:\\mru_test"; const char *test_file_name = "test.txt"; const char *test_full_path = "C:\\mru_test\\test.txt"; @@ -1069,7 +1069,7 @@ static void test_extension_helper(OPENFILENAME* ofn, const char *filter, static void test_extension(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; char curdir[MAX_PATH]; unsigned int i; @@ -1093,7 +1093,6 @@ static void test_extension(void) boolret = GetCurrentDirectoryA(sizeof(curdir), curdir); ok(boolret, "Failed to get current dir err %d\n", GetLastError()); - ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = NULL; ofn.lpstrFile = filename; ofn.nMaxFile = MAX_PATH; @@ -1176,7 +1175,7 @@ static void test_null_filename(void) 'A','l','l','\0','*','\0','\0'}; DWORD ret; - ofnA.lStructSize = sizeof(ofnA); + ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofnA.lpstrFile = NULL; ofnA.nMaxFile = 0; ofnA.nFileOffset = 0xdead; @@ -1207,7 +1206,7 @@ static void test_null_filename(void) ok(ofnA.nFileExtension == 0, "ofnA.nFileExtension is 0x%x, should be 0\n", ofnA.nFileExtension); /* unicode tests */ - ofnW.lStructSize = sizeof(ofnW); + ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W; ofnW.lpstrFile = NULL; ofnW.nMaxFile = 0; ofnW.nFileOffset = 0xdead;

1 0

Huw Davies : commdlg: Set the nt40 version size.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: ac347c7e40d75217439ef43f381666a6658d7017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac347c7e40d75217439ef43f3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:48 2012 +0100 commdlg: Set the nt40 version size. --- dlls/commdlg.dll16/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 3de8b90..7e2fda7 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -73,7 +73,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w if (!lpofn) return FALSE; - ofn32.lStructSize = sizeof(ofn32); + ofn32.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn32.hwndOwner = HWND_32( lpofn->hwndOwner ); ofn32.lpstrFilter = MapSL( lpofn->lpstrFilter ); ofn32.lpstrCustomFilter = MapSL( lpofn->lpstrCustomFilter ); @@ -126,7 +126,7 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w if (!lpofn) return FALSE; - ofn32.lStructSize = sizeof(ofn32); + ofn32.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn32.hwndOwner = HWND_32( lpofn->hwndOwner ); ofn32.lpstrFilter = MapSL( lpofn->lpstrFilter ); ofn32.lpstrCustomFilter = MapSL( lpofn->lpstrCustomFilter );

1 0

Huw Davies : include: Add missing structure members.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 16c7653c2d9cd75c59800a42f7ea41785dd4fd55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c7653c2d9cd75c59800a42f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:49 2012 +0100 include: Add missing structure members. --- include/commdlg.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index c404050..3ab7078 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -95,6 +95,9 @@ typedef struct tagOFNA { LPARAM lCustData; LPOFNHOOKPROC lpfnHook; LPCSTR lpTemplateName; + void *pvReserved; + DWORD dwReserved; + DWORD FlagsEx; } OPENFILENAMEA,*LPOPENFILENAMEA; typedef struct tagOFNW { @@ -118,6 +121,9 @@ typedef struct tagOFNW { LPARAM lCustData; LPOFNHOOKPROC lpfnHook; LPCWSTR lpTemplateName; + void *pvReserved; + DWORD dwReserved; + DWORD FlagsEx; } OPENFILENAMEW,*LPOPENFILENAMEW; DECL_WINELIB_TYPE_AW(OPENFILENAME)

1 0

Huw Davies : comdlg32: Copy additional structure members if present.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 9db8e593bf098e7d669b2f96aebddabc702bcd52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db8e593bf098e7d669b2f96a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:50 2012 +0100 comdlg32: Copy additional structure members if present. --- dlls/comdlg32/filedlg31.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index dcef99e..b52b23e 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -804,6 +804,12 @@ static void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, else /* numbered resource */ ofnW->lpTemplateName = (LPCWSTR) ofnA->lpTemplateName; } + if (ofnW->lStructSize > OPENFILENAME_SIZE_VERSION_400W) + { + ofnW->pvReserved = ofnA->pvReserved; + ofnW->dwReserved = ofnA->dwReserved; + ofnW->FlagsEx = ofnA->FlagsEx; + } }

1 0

Huw Davies : comdlg32: Add structure size checks.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 4c47385ea57ddcd35262590d6ee8d2a7bc2a3e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c47385ea57ddcd35262590d6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:51 2012 +0100 comdlg32: Add structure size checks. --- dlls/comdlg32/filedlg.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 3df67df..9ccd25c 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -4024,6 +4024,12 @@ static void MemFree(void *mem) HeapFree(GetProcessHeap(),0,mem); } +static inline BOOL valid_struct_size( DWORD size ) +{ + return (size == OPENFILENAME_SIZE_VERSION_400W) || + (size == sizeof( OPENFILENAMEW )); +} + static inline BOOL is_win16_looks(DWORD flags) { return (flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE) && @@ -4047,6 +4053,12 @@ BOOL WINAPI GetOpenFileNameA( { TRACE("flags %08x\n", ofn->Flags); + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; @@ -4072,6 +4084,12 @@ BOOL WINAPI GetOpenFileNameW( { TRACE("flags %08x\n", ofn->Flags); + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; @@ -4096,6 +4114,12 @@ BOOL WINAPI GetOpenFileNameW( BOOL WINAPI GetSaveFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + if (is_win16_looks(ofn->Flags)) return GetFileName31A(ofn, SAVE_DIALOG); else @@ -4115,6 +4139,12 @@ BOOL WINAPI GetSaveFileNameA( BOOL WINAPI GetSaveFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + if (is_win16_looks(ofn->Flags)) return GetFileName31W(ofn, SAVE_DIALOG); else

1 0

Alexandre Julliard : include: Fix the CDSIZEOF_STRUCT definition to avoid warnings on 64-bit.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: b037bd7bffb22d79ccdacbe2314b000d65e4dc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b037bd7bffb22d79ccdacbe23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 18:29:09 2012 +0200 include: Fix the CDSIZEOF_STRUCT definition to avoid warnings on 64-bit. --- include/commdlg.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index 3ab7078..1a6e1d9 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -130,7 +130,7 @@ DECL_WINELIB_TYPE_AW(OPENFILENAME) DECL_WINELIB_TYPE_AW(LPOPENFILENAME) #ifndef CDSIZEOF_STRUCT -#define CDSIZEOF_STRUCT(type,field) ((int)&(((type *)0)->field) + sizeof(((type*)0)->field)) +#define CDSIZEOF_STRUCT(type,field) ((INT_PTR)&(((type *)0)->field) + sizeof(((type*)0)->field)) #endif #define OPENFILENAME_SIZE_VERSION_400A CDSIZEOF_STRUCT(OPENFILENAMEA,lpTemplateName)

1 0