September 2012 - Wine-Commits

Piotr Caban : wininet: Move GetUrlCacheEntryInfoA code to GetUrlCacheEntryInfoExA function.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

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

Huw Davies : comdlg32: Use a ComboBoxEx control for the filename if the structure size is not the nt40 version size .
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 7a2d68abc89b7ea07436dd5a7d2ecf34376d47a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2d68abc89b7ea07436dd5a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:19 2012 +0100 comdlg32: Use a ComboBoxEx control for the filename if the structure size is not the nt40 version size. --- dlls/comdlg32/comdlg32.rc | 1 + dlls/comdlg32/filedlg.c | 34 ++++++++++++++++++++++++++++------ po/ar.po | 18 +++++++++--------- po/bg.po | 18 +++++++++--------- po/ca.po | 18 +++++++++--------- po/cs.po | 18 +++++++++--------- po/da.po | 18 +++++++++--------- po/de.po | 18 +++++++++--------- po/el.po | 18 +++++++++--------- po/en.po | 18 +++++++++--------- po/en_US.po | 18 +++++++++--------- po/eo.po | 18 +++++++++--------- po/es.po | 18 +++++++++--------- po/fa.po | 18 +++++++++--------- po/fi.po | 18 +++++++++--------- po/fr.po | 18 +++++++++--------- po/he.po | 18 +++++++++--------- po/hi.po | 18 +++++++++--------- po/hu.po | 18 +++++++++--------- po/it.po | 18 +++++++++--------- po/ja.po | 18 +++++++++--------- po/ko.po | 18 +++++++++--------- po/lt.po | 18 +++++++++--------- po/ml.po | 18 +++++++++--------- po/nb_NO.po | 18 +++++++++--------- po/nl.po | 18 +++++++++--------- po/or.po | 18 +++++++++--------- po/pa.po | 18 +++++++++--------- po/pl.po | 18 +++++++++--------- po/pt_BR.po | 18 +++++++++--------- po/pt_PT.po | 18 +++++++++--------- po/rm.po | 18 +++++++++--------- po/ro.po | 18 +++++++++--------- po/ru.po | 18 +++++++++--------- po/sk.po | 18 +++++++++--------- po/sl.po | 18 +++++++++--------- po/sr_RS(a)cyrillic.po | 18 +++++++++--------- po/sr_RS(a)latin.po | 18 +++++++++--------- po/sv.po | 18 +++++++++--------- po/te.po | 18 +++++++++--------- po/th.po | 18 +++++++++--------- po/tr.po | 18 +++++++++--------- po/uk.po | 18 +++++++++--------- po/wa.po | 18 +++++++++--------- po/wine.pot | 18 +++++++++--------- po/zh_CN.po | 18 +++++++++--------- po/zh_TW.po | 18 +++++++++--------- 47 files changed, 434 insertions(+), 411 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a2d68abc89b7ea07436d…

1 0

Jacek Caban : mshtml: Return S_OK in plugin host' s CanInPlaceActivate implementation.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: ff34939400805e75fda9c658c3b28bf54adeb5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff34939400805e75fda9c658c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:18:44 2012 +0200 mshtml: Return S_OK in plugin host's CanInPlaceActivate implementation. --- dlls/mshtml/pluginhost.c | 6 ++++-- dlls/mshtml/tests/activex.c | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index ee7773f..e4b85a8 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -875,8 +875,10 @@ static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *ifac static HRESULT WINAPI PHInPlaceSite_CanInPlaceActivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return S_OK; } static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index ebd2057..775a676 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -903,6 +903,9 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSiteEx, (void**)&ip_site); ok(hres == S_OK, "Could not get IOleInPlaceSiteEx iface: %08x\n", hres); + hres = IOleInPlaceSiteEx_CanInPlaceActivate(ip_site); + ok(hres == S_OK, "CanInPlaceActivate failed: %08x\n", hres); + SET_EXPECT(InPlaceObject_GetWindow); no_redraw = 0xdeadbeef; hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ip_site, &no_redraw, 0);

1 0

Jacek Caban : mshtml: Added DISPATCH_PROPERTYGET|DISPATCH_METHOD flags support for elements exposed as window properties .
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: f90798572a0855361bde2935290cdfd3c539ad93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90798572a0855361bde29352… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:18:30 2012 +0200 mshtml: Added DISPATCH_PROPERTYGET|DISPATCH_METHOD flags support for elements exposed as window properties. --- dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/tests/vbtest.html | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fc432d8..7122b4b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2599,6 +2599,7 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD } case GLOBAL_ELEMENTVAR: switch(flags) { + case DISPATCH_PROPERTYGET|DISPATCH_METHOD: case DISPATCH_PROPERTYGET: { IHTMLElement *elem; diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index f023f98..44212e7 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -33,6 +33,7 @@ Sub runTest() Call ok(counter = 6, "counter = " & counter) Call ok(isNull(document.onkeyup), "document.onkeyup is not null") Call ok(document.formname.tagName = "FORM", "document.form.tagName = " & document.formname.tagName) + Call ok(formname.tagName = "FORM", "form.tagName = " & formname.tagName) Call external.reportSuccess() End Sub </script>

1 0

Huw Davies : comctl32: Forward the focus to the edit control if it exists.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 3cfc2ab772924cc18690c2c86afadeea0f10de9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cfc2ab772924cc18690c2c86… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:17 2012 +0100 comctl32: Forward the focus to the edit control if it exists. --- dlls/comctl32/comboex.c | 3 ++- dlls/comctl32/tests/comboex.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index a72f897..d92da3d 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -2308,7 +2308,8 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return COMBOEX_WindowPosChanging (infoPtr, (WINDOWPOS *)lParam); case WM_SETFOCUS: - SetFocus(infoPtr->hwndCombo); + if (infoPtr->hwndEdit) SetFocus( infoPtr->hwndEdit ); + else SetFocus( infoPtr->hwndCombo ); return 0; case WM_SYSCOLORCHANGE: diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 172e564..7cddbaf 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -345,6 +345,11 @@ static void test_WM_LBUTTONDOWN(void) "Current Selection: expected %d, got %d\n", 4, idx); ok(received_end_edit, "Expected to receive a CBEN_ENDEDIT message\n"); + SetFocus( hComboExParentWnd ); + ok( GetFocus() == hComboExParentWnd, "got %p\n", GetFocus() ); + SetFocus( hComboEx ); + ok( GetFocus() == hEdit, "got %p\n", GetFocus() ); + DestroyWindow(hComboEx); }

1 0

Dmitry Timoshkov : gdiplus: Add GIF loopcount to the image properties.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

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

Francois Gouget : wininet: Check for the 'http:' protocol in a locale independent way.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 2606b8568701e225ab3a8f30f7bf6aad6c24323b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2606b8568701e225ab3a8f30f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 11:33:05 2012 +0200 wininet: Check for the 'http:' protocol in a locale independent way. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 28f82a3..f465ad7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -640,7 +640,7 @@ static void HTTP_FixURL(http_request_t *request) } } - if(CSTR_EQUAL != CompareStringW( LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + if(CSTR_EQUAL != CompareStringW( LOCALE_INVARIANT, NORM_IGNORECASE, request->path, strlenW(request->path), szHttp, strlenW(szHttp) ) && request->path[0] != '/') /* not an absolute path ?? --> fix it !! */ {

1 0

Huw Davies : comdlg32: Use the window handle to send messages to the filename control.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 01a084383c3f50ebeafc11f2930a0bb9a7d3428f URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a084383c3f50ebeafc11f29… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:18 2012 +0100 comdlg32: Use the window handle to send messages to the filename control. --- dlls/comdlg32/filedlg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 9ccd25c..416ee19 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1546,10 +1546,10 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("Value in Filename includes path, overriding InitialDir: %s, %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); } - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } else { - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } } @@ -1623,7 +1623,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("Value in Filename includes path, overriding initdir: %s, %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); } - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } /* 4. Win2000+: Recently used */ @@ -1707,7 +1707,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("No initial dir specified, using current dir of %s\n", debugstr_w(fodInfos->initdir)); } } - SetFocus(GetDlgItem(hwnd, IDC_FILENAME)); + SetFocus( fodInfos->DlgInfos.hwndFileName ); TRACE("After manipulation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); /* Must the open as read only check box be checked ?*/ @@ -3740,10 +3740,10 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U TRACE("\n"); - /* get the filenames from the edit control */ - nStrLen = SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0); + /* get the filenames from the filename control */ + nStrLen = GetWindowTextLengthW( fodInfos->DlgInfos.hwndFileName ); lpstrEdit = MemAlloc( (nStrLen+1)*sizeof(WCHAR) ); - GetDlgItemTextW(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1); + GetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrEdit, nStrLen+1); TRACE("nStrLen=%u str=%s\n", nStrLen, debugstr_w(lpstrEdit));

1 0

Dmitry Timoshkov : gdiplus: Add GIF comment to the image properties.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

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 Sept. 25, 2012

Sept. 25, 2012

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