September 2012 - Wine-commits

Jacek Caban : vbscript: Added Space() implementation.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 7308be6c0ad06a6d2b8384fcc8a9396556dcc0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7308be6c0ad06a6d2b8384fcc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:25:22 2012 +0200 vbscript: Added Space() implementation. --- dlls/vbscript/global.c | 30 ++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 4 ++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0513664..f7d8efe 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -672,8 +672,34 @@ static HRESULT Global_Trim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Space(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str; + int n, i; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + hres = to_int(arg, &n); + if(FAILED(hres)) + return hres; + + if(n < 0) { + FIXME("n = %d\n", n); + return E_NOTIMPL; + } + + if(!res) + return S_OK; + + str = SysAllocStringLen(NULL, n); + if(!str) + return E_OUTOFMEMORY; + + for(i=0; i<n; i++) + str[i] = ' '; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + return S_OK; } static HRESULT Global_String(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c17c5b4..2ad9404 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -179,4 +179,8 @@ Call ok(Len(1) = 1, "Len(1) = " & Len(1)) Call ok(isNull(Len(null)), "Len(null) = " & Len(null)) Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) +Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") +Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") +Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") + Call reportSuccess()

1 0

Piotr Caban : wininet: Move GetUrlCacheEntryInfoA code to GetUrlCacheEntryInfoExA function.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 134db11effd1360e376d9e8afecbd1041f5261ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=134db11effd1360e376d9e8af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:30:42 2012 +0200 wininet: Move GetUrlCacheEntryInfoA code to GetUrlCacheEntryInfoExA function. --- dlls/wininet/urlcache.c | 54 +++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 45f447f..25e2ecf 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1708,6 +1708,13 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( LPVOID lpReserved, DWORD dwFlags) { + LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; + const CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; + URLCACHECONTAINER * pContainer; + DWORD error; + TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", debugstr_a(lpszUrl), lpCacheEntryInfo, @@ -1731,29 +1738,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } - return GetUrlCacheEntryInfoA(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize); -} - -/*********************************************************************** - * GetUrlCacheEntryInfoA (WININET.@) - * - */ -BOOL WINAPI GetUrlCacheEntryInfoA( - IN LPCSTR lpszUrlName, - IN LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, - IN OUT LPDWORD lpdwCacheEntryInfoBufferSize -) -{ - LPURLCACHE_HEADER pHeader; - struct _HASH_ENTRY * pHashEntry; - const CACHEFILE_ENTRY * pEntry; - const URL_CACHEFILE_ENTRY * pUrlEntry; - URLCACHECONTAINER * pContainer; - DWORD error; - TRACE("(%s, %p, %p)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); - - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1770,10 +1756,10 @@ BOOL WINAPI GetUrlCacheEntryInfoA( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindHash(pHeader, lpszUrlName, &pHashEntry)) + if (!URLCache_FindHash(pHeader, lpszUrl, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - WARN("entry %s not found!\n", debugstr_a(lpszUrlName)); + WARN("entry %s not found!\n", debugstr_a(lpszUrl)); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -1792,16 +1778,16 @@ BOOL WINAPI GetUrlCacheEntryInfoA( if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); - if (lpdwCacheEntryInfoBufferSize) + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo) - *lpdwCacheEntryInfoBufferSize = 0; + *lpdwCacheEntryInfoBufSize = 0; error = URLCache_CopyEntry( pContainer, pHeader, lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, + lpdwCacheEntryInfoBufSize, pUrlEntry, FALSE /* ANSI */); if (error != ERROR_SUCCESS) @@ -1819,6 +1805,20 @@ BOOL WINAPI GetUrlCacheEntryInfoA( } /*********************************************************************** + * GetUrlCacheEntryInfoA (WININET.@) + * + */ +BOOL WINAPI GetUrlCacheEntryInfoA( + IN LPCSTR lpszUrlName, + IN LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + IN OUT LPDWORD lpdwCacheEntryInfoBufferSize +) +{ + return GetUrlCacheEntryInfoExA(lpszUrlName, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, NULL, NULL, NULL, 0); +} + +/*********************************************************************** * GetUrlCacheEntryInfoW (WININET.@) * */

1 0

Piotr Caban : wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoA.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: a342ded2887997e7b4734a4b0c946e10a40835e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a342ded2887997e7b4734a4b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:30:58 2012 +0200 wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoA. --- dlls/wininet/urlcache.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 25e2ecf..c0d11b6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -81,6 +81,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_FLAG_BITS 6 #define PENDING_DELETE_CACHE_ENTRY 0x00400000 +#define INSTALLED_CACHE_ENTRY 0x10000000 +#define GET_INSTALLED_ENTRY 0x200 #define CACHE_CONTAINER_NO_SUBDIR 0xFE #define CACHE_HEADER_DATA_ROOT_LEAK_OFFSET 0x16 @@ -1732,7 +1734,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags != 0) + if (dwFlags & ~GET_INSTALLED_ENTRY) { FIXME("Undocumented flag(s): %x\n", dwFlags); SetLastError(ERROR_FILE_NOT_FOUND); @@ -1778,6 +1780,13 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + if((dwFlags & GET_INSTALLED_ENTRY) && !(pUrlEntry->CacheEntryType & INSTALLED_CACHE_ENTRY)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo)

1 0

Piotr Caban : wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoW.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 7c6f0c947041f9dbc230f2c0c5dcc66e2b89cb0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6f0c947041f9dbc230f2c0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:19 2012 +0200 wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoW. --- dlls/wininet/urlcache.c | 99 ++++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 48 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c0d11b6..befb9b7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1835,6 +1835,23 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, LPDWORD lpdwCacheEntryInfoBufferSize) { + return GetUrlCacheEntryInfoExW(lpszUrl, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, NULL, NULL, NULL, 0); +} + +/*********************************************************************** + * GetUrlCacheEntryInfoExW (WININET.@) + * + */ +BOOL WINAPI GetUrlCacheEntryInfoExW( + LPCWSTR lpszUrl, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufSize, + LPWSTR lpszReserved, + LPDWORD lpdwReserved, + LPVOID lpReserved, + DWORD dwFlags) +{ LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; const CACHEFILE_ENTRY * pEntry; @@ -1842,7 +1859,32 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, URLCACHECONTAINER * pContainer; DWORD error; - TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); + TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", + debugstr_w(lpszUrl), + lpCacheEntryInfo, + lpdwCacheEntryInfoBufSize, + lpszReserved, + lpdwReserved, + lpReserved, + dwFlags); + + /* Ignore GET_INSTALLED_ENTRY flag in unicode version of function */ + dwFlags &= ~GET_INSTALLED_ENTRY; + + if ((lpszReserved != NULL) || + (lpdwReserved != NULL) || + (lpReserved != NULL)) + { + ERR("Reserved value was not 0\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (dwFlags != 0) + { + FIXME("Undocumented flag(s): %x\n", dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1882,18 +1924,18 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); - if (lpdwCacheEntryInfoBufferSize) + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo) - *lpdwCacheEntryInfoBufferSize = 0; + *lpdwCacheEntryInfoBufSize = 0; error = URLCache_CopyEntry( - pContainer, - pHeader, - (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - pUrlEntry, - TRUE /* UNICODE */); + pContainer, + pHeader, + (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, + lpdwCacheEntryInfoBufSize, + pUrlEntry, + TRUE /* UNICODE */); if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1909,45 +1951,6 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, } /*********************************************************************** - * GetUrlCacheEntryInfoExW (WININET.@) - * - */ -BOOL WINAPI GetUrlCacheEntryInfoExW( - LPCWSTR lpszUrl, - LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, - LPDWORD lpdwCacheEntryInfoBufSize, - LPWSTR lpszReserved, - LPDWORD lpdwReserved, - LPVOID lpReserved, - DWORD dwFlags) -{ - TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", - debugstr_w(lpszUrl), - lpCacheEntryInfo, - lpdwCacheEntryInfoBufSize, - lpszReserved, - lpdwReserved, - lpReserved, - dwFlags); - - if ((lpszReserved != NULL) || - (lpdwReserved != NULL) || - (lpReserved != NULL)) - { - ERR("Reserved value was not 0\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (dwFlags != 0) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - return GetUrlCacheEntryInfoW(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize); -} - -/*********************************************************************** * SetUrlCacheEntryInfoA (WININET.@) */ BOOL WINAPI SetUrlCacheEntryInfoA(

1 0

Dmitry Timoshkov : gdiplus: Add GIF comment to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 000f4725aa67dee4f3c321b87d03b297257a53a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000f4725aa67dee4f3c321b87… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:51:23 2012 +0900 gdiplus: Add GIF comment to the image properties. --- dlls/gdiplus/image.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 126 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c6018ab..69879ac 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3100,8 +3100,133 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * return GdipLoadImageFromFile(filename, image); } -static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame) +static void add_property(GpBitmap *bitmap, PropertyItem *item) { + UINT prop_size, prop_count; + PropertyItem *prop_item; + + if (bitmap->prop_item == NULL) + { + prop_size = prop_count = 0; + prop_item = GdipAlloc(item->length + sizeof(PropertyItem)); + if (!prop_item) return; + } + else + { + UINT i; + char *item_value; + + GdipGetPropertySize((GpImage *)bitmap, &prop_size, &prop_count); + + prop_item = GdipAlloc(prop_size + item->length + sizeof(PropertyItem)); + if (!prop_item) return; + memcpy(prop_item, bitmap->prop_item, sizeof(PropertyItem) * bitmap->prop_count); + prop_size -= sizeof(PropertyItem) * bitmap->prop_count; + memcpy(prop_item + prop_count + 1, bitmap->prop_item + prop_count, prop_size); + + item_value = (char *)(prop_item + prop_count + 1); + + for (i = 0; i < prop_count; i++) + { + prop_item[i].value = item_value; + item_value += prop_item[i].length; + } + } + + prop_item[prop_count].id = item->id; + prop_item[prop_count].type = item->type; + prop_item[prop_count].length = item->length; + prop_item[prop_count].value = (char *)(prop_item + prop_count + 1) + prop_size; + memcpy(prop_item[prop_count].value, item->value, item->length); + + GdipFree(bitmap->prop_item); + bitmap->prop_item = prop_item; + bitmap->prop_count++; +} + +static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, const WCHAR *prop_name) +{ + HRESULT hr; + GUID format; + PROPVARIANT id, value; + PropertyItem *item = NULL; + + IWICMetadataReader_GetMetadataFormat(reader, &format); + if (!IsEqualGUID(&format, guid)) return NULL; + + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_LPWSTR; + id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + if (!id.u.pwszVal) return NULL; + lstrcpyW(id.u.pwszVal, prop_name); + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + if (hr == S_OK) + { + UINT item_size = propvariant_size(&value); + if (item_size) + { + item_size += sizeof(*item); + item = GdipAlloc(item_size); + if (propvariant_to_item(&value, item, item_size, 0) != Ok) + { + GdipFree(item); + item = NULL; + } + } + } + + PropVariantClear(&id); + PropVariantClear(&value); + + return item; +} + +static PropertyItem *get_gif_comment(IWICMetadataReader *reader) +{ + static const WCHAR textentryW[] = { 'T','e','x','t','E','n','t','r','y',0 }; + PropertyItem *comment; + + comment = get_property(reader, &GUID_MetadataFormatGifComment, textentryW); + if (comment) + comment->id = PropertyTagExifUserComment; + + return comment; +} + +static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +{ + HRESULT hr; + IWICMetadataBlockReader *block_reader; + IWICMetadataReader *reader; + UINT block_count, i; + PropertyItem *comment = NULL; + + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICMetadataBlockReader, (void **)&block_reader); + if (hr == S_OK) + { + hr = IWICMetadataBlockReader_GetCount(block_reader, &block_count); + if (hr == S_OK) + { + for (i = 0; i < block_count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); + if (hr == S_OK) + { + if (!comment) + comment = get_gif_comment(reader); + + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + if (comment) add_property(bitmap, comment); + + GdipFree(comment); } typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame);

1 0

Dmitry Timoshkov : gdiplus: Add GIF frame delay to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 3bb4974dd45b8030afd64948e20f616f8a6cc8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb4974dd45b8030afd64948e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:52:19 2012 +0900 gdiplus: Add GIF frame delay to the image properties. --- dlls/gdiplus/image.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 69879ac..5c7c30a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3195,13 +3195,81 @@ static PropertyItem *get_gif_comment(IWICMetadataReader *reader) return comment; } -static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) { + static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; HRESULT hr; IWICMetadataBlockReader *block_reader; IWICMetadataReader *reader; UINT block_count, i; - PropertyItem *comment = NULL; + PropertyItem *delay; + LONG value = 0; + + hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); + if (hr == S_OK) + { + hr = IWICMetadataBlockReader_GetCount(block_reader, &block_count); + if (hr == S_OK) + { + for (i = 0; i < block_count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); + if (hr == S_OK) + { + delay = get_property(reader, &GUID_MetadataFormatGCE, delayW); + if (delay) + { + if (delay->type == PropertyTagTypeShort && delay->length == 2) + value = *(SHORT *)delay->value; + + GdipFree(delay); + } + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + return value; +} + +static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +{ + HRESULT hr; + IWICBitmapFrameDecode *frame; + IWICMetadataBlockReader *block_reader; + IWICMetadataReader *reader; + UINT frame_count, block_count, i; + PropertyItem *delay = NULL, *comment = NULL; + + IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + if (frame_count > 1) + { + delay = GdipAlloc(sizeof(*delay) + frame_count * sizeof(LONG)); + if (delay) + { + LONG *value; + + delay->type = PropertyTagTypeLong; + delay->id = PropertyTagFrameDelay; + delay->length = frame_count * sizeof(LONG); + delay->value = delay + 1; + + value = delay->value; + + for (i = 0; i < frame_count; i++) + { + hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); + if (hr == S_OK) + { + value[i] = get_gif_frame_delay(frame); + IWICBitmapFrameDecode_Release(frame); + } + else value[i] = 0; + } + } + } hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICMetadataBlockReader, (void **)&block_reader); if (hr == S_OK) @@ -3224,8 +3292,10 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataBlockReader_Release(block_reader); } + if (delay) add_property(bitmap, delay); if (comment) add_property(bitmap, comment); + GdipFree(delay); GdipFree(comment); }

1 0

Dmitry Timoshkov : gdiplus: Add GIF background to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: a950a0549fda5a560ab93e49f615d73297e5f609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a950a0549fda5a560ab93e49f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:53:08 2012 +0900 gdiplus: Add GIF background to the image properties. --- dlls/gdiplus/image.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5c7c30a..e3c4353 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3195,6 +3195,18 @@ static PropertyItem *get_gif_comment(IWICMetadataReader *reader) return comment; } +static PropertyItem *get_gif_background(IWICMetadataReader *reader) +{ + static const WCHAR backgroundW[] = { 'B','a','c','k','g','r','o','u','n','d','C','o','l','o','r','I','n','d','e','x',0 }; + PropertyItem *background; + + background = get_property(reader, &GUID_MetadataFormatLSD, backgroundW); + if (background) + background->id = PropertyTagIndexBackground; + + return background; +} + static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) { static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; @@ -3241,7 +3253,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataBlockReader *block_reader; IWICMetadataReader *reader; UINT frame_count, block_count, i; - PropertyItem *delay = NULL, *comment = NULL; + PropertyItem *delay = NULL, *comment = NULL, *background = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); if (frame_count > 1) @@ -3285,6 +3297,9 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (!comment) comment = get_gif_comment(reader); + if (!background) + background = get_gif_background(reader); + IWICMetadataReader_Release(reader); } } @@ -3294,9 +3309,11 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (delay) add_property(bitmap, delay); if (comment) add_property(bitmap, comment); + if (background) add_property(bitmap, background); GdipFree(delay); GdipFree(comment); + GdipFree(background); } typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame);

1 0

Dmitry Timoshkov : gdiplus: Add GIF transparent index to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 54edca19e1dbcb33f197771557c7ee05faf0f7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54edca19e1dbcb33f19777155… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:54:01 2012 +0900 gdiplus: Add GIF transparent index to the image properties. --- dlls/gdiplus/image.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e3c4353..1732781 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3144,6 +3144,33 @@ static void add_property(GpBitmap *bitmap, PropertyItem *item) bitmap->prop_count++; } +static BOOL get_bool_property(IWICMetadataReader *reader, const GUID *guid, const WCHAR *prop_name) +{ + HRESULT hr; + GUID format; + PROPVARIANT id, value; + BOOL ret = FALSE; + + IWICMetadataReader_GetMetadataFormat(reader, &format); + if (!IsEqualGUID(&format, guid)) return FALSE; + + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_LPWSTR; + id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + if (!id.u.pwszVal) return FALSE; + lstrcpyW(id.u.pwszVal, prop_name); + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + if (hr == S_OK && value.vt == VT_BOOL) + ret = value.u.boolVal; + + PropVariantClear(&id); + PropVariantClear(&value); + + return ret; +} + static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, const WCHAR *prop_name) { HRESULT hr; @@ -3207,6 +3234,21 @@ static PropertyItem *get_gif_background(IWICMetadataReader *reader) return background; } +static PropertyItem *get_gif_transparent_idx(IWICMetadataReader *reader) +{ + static const WCHAR transparency_flagW[] = { 'T','r','a','n','s','p','a','r','e','n','c','y','F','l','a','g',0 }; + static const WCHAR colorW[] = { 'T','r','a','n','s','p','a','r','e','n','t','C','o','l','o','r','I','n','d','e','x',0 }; + PropertyItem *index = NULL; + + if (get_bool_property(reader, &GUID_MetadataFormatGCE, transparency_flagW)) + { + index = get_property(reader, &GUID_MetadataFormatGCE, colorW); + if (index) + index->id = PropertyTagIndexTransparent; + } + return index; +} + static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) { static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; @@ -3254,6 +3296,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataReader *reader; UINT frame_count, block_count, i; PropertyItem *delay = NULL, *comment = NULL, *background = NULL; + PropertyItem *transparent_idx = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); if (frame_count > 1) @@ -3314,6 +3357,36 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI GdipFree(delay); GdipFree(comment); GdipFree(background); + + /* Win7 gdiplus always returns transparent color index from frame 0 */ + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + if (hr != S_OK) return; + + hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); + if (hr == S_OK) + { + hr = IWICMetadataBlockReader_GetCount(block_reader, &block_count); + if (hr == S_OK) + { + for (i = 0; i < block_count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); + if (hr == S_OK) + { + if (!transparent_idx) + transparent_idx = get_gif_transparent_idx(reader); + + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + if (transparent_idx) add_property(bitmap, transparent_idx); + GdipFree(transparent_idx); + + IWICBitmapFrameDecode_Release(frame); } typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame);

1 0

Dmitry Timoshkov : gdiplus: Add GIF loopcount to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: faa24d96d43c7a87523126c167a14aabacd931fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa24d96d43c7a87523126c16… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:55:04 2012 +0900 gdiplus: Add GIF loopcount to the image properties. --- dlls/gdiplus/image.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1732781..b71b35b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3222,6 +3222,47 @@ static PropertyItem *get_gif_comment(IWICMetadataReader *reader) return comment; } +static PropertyItem *get_gif_loopcount(IWICMetadataReader *reader) +{ + static const WCHAR applicationW[] = { 'A','p','p','l','i','c','a','t','i','o','n',0 }; + static const WCHAR dataW[] = { 'D','a','t','a',0 }; + PropertyItem *appext = NULL, *appdata = NULL, *loop = NULL; + + appext = get_property(reader, &GUID_MetadataFormatAPE, applicationW); + if (appext) + { + if (appext->type == PropertyTagTypeByte && appext->length == 11 && + (!memcmp(appext->value, "NETSCAPE2.0", 11) || !memcmp(appext->value, "ANIMEXTS1.0", 11))) + { + appdata = get_property(reader, &GUID_MetadataFormatAPE, dataW); + if (appdata) + { + if (appdata->type == PropertyTagTypeByte && appdata->length == 4) + { + BYTE *data = appdata->value; + if (data[0] == 3 && data[1] == 1) + { + loop = GdipAlloc(sizeof(*loop) + sizeof(SHORT)); + if (loop) + { + loop->type = PropertyTagTypeShort; + loop->id = PropertyTagLoopCount; + loop->length = sizeof(SHORT); + loop->value = loop + 1; + *(SHORT *)loop->value = data[2] | (data[3] << 8); + } + } + } + } + } + } + + GdipFree(appext); + GdipFree(appdata); + + return loop; +} + static PropertyItem *get_gif_background(IWICMetadataReader *reader) { static const WCHAR backgroundW[] = { 'B','a','c','k','g','r','o','u','n','d','C','o','l','o','r','I','n','d','e','x',0 }; @@ -3296,7 +3337,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataReader *reader; UINT frame_count, block_count, i; PropertyItem *delay = NULL, *comment = NULL, *background = NULL; - PropertyItem *transparent_idx = NULL; + PropertyItem *transparent_idx = NULL, *loop = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); if (frame_count > 1) @@ -3340,6 +3381,9 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (!comment) comment = get_gif_comment(reader); + if (frame_count > 1 && !loop) + loop = get_gif_loopcount(reader); + if (!background) background = get_gif_background(reader); @@ -3350,12 +3394,27 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataBlockReader_Release(block_reader); } + if (frame_count > 1 && !loop) + { + loop = GdipAlloc(sizeof(*loop) + sizeof(SHORT)); + if (loop) + { + loop->type = PropertyTagTypeShort; + loop->id = PropertyTagLoopCount; + loop->length = sizeof(SHORT); + loop->value = loop + 1; + *(SHORT *)loop->value = 1; + } + } + if (delay) add_property(bitmap, delay); if (comment) add_property(bitmap, comment); + if (loop) add_property(bitmap, loop); if (background) add_property(bitmap, background); GdipFree(delay); GdipFree(comment); + GdipFree(loop); GdipFree(background); /* Win7 gdiplus always returns transparent color index from frame 0 */

1 0

Dmitry Timoshkov : gdiplus: Add GIF palette to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 0ef523e2bfe44d14d51a402a19feff47174b342f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef523e2bfe44d14d51a402a1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:55:57 2012 +0900 gdiplus: Add GIF palette to the image properties. --- dlls/gdiplus/image.c | 63 +++++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b71b35b..5e0b1ea 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3275,6 +3275,62 @@ static PropertyItem *get_gif_background(IWICMetadataReader *reader) return background; } +static PropertyItem *get_gif_palette(IWICBitmapDecoder *decoder, IWICMetadataReader *reader) +{ + static const WCHAR global_flagW[] = { 'G','l','o','b','a','l','C','o','l','o','r','T','a','b','l','e','F','l','a','g',0 }; + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *palette; + UINT count = 0; + WICColor colors[256]; + + if (!get_bool_property(reader, &GUID_MetadataFormatLSD, global_flagW)) + return NULL; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (hr != S_OK) return NULL; + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + if (hr == S_OK) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + if (hr == S_OK) + IWICPalette_GetColors(palette, 256, colors, &count); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + + if (count) + { + PropertyItem *pal; + UINT i; + BYTE *rgb; + + pal = GdipAlloc(sizeof(*pal) + count * 3); + if (!pal) return NULL; + pal->type = PropertyTagTypeByte; + pal->id = PropertyTagGlobalPalette; + pal->value = pal + 1; + pal->length = count * 3; + + rgb = pal->value; + + for (i = 0; i < count; i++) + { + rgb[i*3] = (colors[i] >> 16) & 0xff; + rgb[i*3 + 1] = (colors[i] >> 8) & 0xff; + rgb[i*3 + 2] = colors[i] & 0xff; + } + + return pal; + } + + return NULL; +} + static PropertyItem *get_gif_transparent_idx(IWICMetadataReader *reader) { static const WCHAR transparency_flagW[] = { 'T','r','a','n','s','p','a','r','e','n','c','y','F','l','a','g',0 }; @@ -3337,7 +3393,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataReader *reader; UINT frame_count, block_count, i; PropertyItem *delay = NULL, *comment = NULL, *background = NULL; - PropertyItem *transparent_idx = NULL, *loop = NULL; + PropertyItem *transparent_idx = NULL, *loop = NULL, *palette = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); if (frame_count > 1) @@ -3387,6 +3443,9 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (!background) background = get_gif_background(reader); + if (!palette) + palette = get_gif_palette(decoder, reader); + IWICMetadataReader_Release(reader); } } @@ -3410,11 +3469,13 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (delay) add_property(bitmap, delay); if (comment) add_property(bitmap, comment); if (loop) add_property(bitmap, loop); + if (palette) add_property(bitmap, palette); if (background) add_property(bitmap, background); GdipFree(delay); GdipFree(comment); GdipFree(loop); + GdipFree(palette); GdipFree(background); /* Win7 gdiplus always returns transparent color index from frame 0 */ diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9313f2c..62bc48b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3988,7 +3988,6 @@ static void test_gif_properties(void) status = GdipGetPropertyCount(image, &prop_count); expect(Ok, status); -todo_wine ok(prop_count == sizeof(td)/sizeof(td[0]) || broken(prop_count == 1) /* before win7 */, "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count);

1 0