September 2012 - Wine-Commits

Jacek Caban : itss: Canonicalize relative paths before resolving object.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 1a56a73c861f4e137119f1de86c41d0098fa2e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a56a73c861f4e137119f1de8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 21 12:28:18 2012 +0200 itss: Canonicalize relative paths before resolving object. --- dlls/itss/protocol.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ dlls/itss/tests/protocol.c | 3 ++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index fa2ad8b..6b188c6 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -134,6 +134,55 @@ static LPCWSTR skip_schema(LPCWSTR url) return NULL; } +/* Adopted from urlmon */ +static void remove_dot_segments(WCHAR *path) { + const WCHAR *in = path; + WCHAR *out = path; + + while(1) { + /* Move the first path segment in the input buffer to the end of + * the output buffer, and any subsequent characters up to, including + * the next "/" character (if any) or the end of the input buffer. + */ + while(*in != '/') { + if(!(*out++ = *in++)) + return; + } + + *out++ = *in++; + + while(*in) { + if(*in != '.') + break; + + /* Handle ending "/." */ + if(!in[1]) { + ++in; + break; + } + + /* Handle "/./" */ + if(in[1] == '/') { + in += 2; + continue; + } + + /* If we don't have "/../" or ending "/.." */ + if(in[1] != '.' || (in[2] && in[2] != '/')) + break; + + in += *in ? 3 : 2; + + /* Find the slash preceding out pointer and move out pointer to it */ + if(out > path+1 && *--out == '/') + --out; + while(out > path && *(--out) != '/'); + if(*out == '/') + ++out; + } + } +} + static HRESULT report_result(IInternetProtocolSink *sink, HRESULT hres) { IInternetProtocolSink_ReportResult(sink, hres, 0, NULL); @@ -215,6 +264,8 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, *p = '/'; } + remove_dot_segments(object_name); + TRACE("Resolving %s\n", debugstr_w(object_name)); memset(&chm_object, 0, sizeof(chm_object)); diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index b718502..7467d37 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -87,6 +87,8 @@ static const WCHAR blank_url7[] = {'m','k',':','@','M','S','I','T','S','t','o',' 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; static const WCHAR blank_url8[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; +static const WCHAR blank_url9[] = {'i','t','s',':', + 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/','.','.','/','b','l','a','n','k','.','h','t','m','l',0}; static enum { ITS_PROTOCOL, @@ -612,6 +614,7 @@ static void test_its_protocol(void) test_protocol_url(factory, blank_url5, TRUE); test_protocol_url(factory, blank_url6, TRUE); test_protocol_url(factory, blank_url8, TRUE); + test_protocol_url(factory, blank_url9, TRUE); bindf = BINDF_FROMURLMON | BINDF_NEEDFILE; test_protocol_url(factory, blank_url1, TRUE); }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the map/ unmap functions.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: a6c543d0e6e2c76f7a357f3d72c242df8fdba78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c543d0e6e2c76f7a357f3d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 16:50:17 2012 +0200 winex11: Add window data structure locking to the map/unmap functions. --- dlls/winex11.drv/event.c | 60 +++++++++++++++++++++++------------ dlls/winex11.drv/window.c | 76 ++++++++++++++++++++++++++------------------- 2 files changed, 84 insertions(+), 52 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1f49c3c..4e4b816 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1163,7 +1163,7 @@ static int get_window_wm_state( Display *display, Window window ) */ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL update_window ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data = get_win_data( hwnd ); DWORD style; if (!data) return; @@ -1185,13 +1185,13 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat data->wm_state = new_state; /* ignore the initial state transition out of withdrawn state */ /* metacity does Withdrawn->NormalState->IconicState when mapping an iconic window */ - if (!old_state) return; + if (!old_state) goto done; } } break; } - if (!update_window || !data->managed || !data->mapped) return; + if (!update_window || !data->managed || !data->mapped) goto done; style = GetWindowLongW( data->hwnd, GWL_STYLE ); @@ -1203,17 +1203,20 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED)) { TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + release_win_data( data ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + return; } - else TRACE( "not restoring to max win %p/%lx style %08x\n", - data->hwnd, data->whole_window, style ); + TRACE( "not restoring to max win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + release_win_data( data ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + return; } - else TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); + TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (!data->iconic && data->wm_state == IconicState) { @@ -1221,10 +1224,14 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if ((style & WS_MINIMIZEBOX) && !(style & WS_DISABLED)) { TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + release_win_data( data ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + return; } - else TRACE( "not minimizing win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); + TRACE( "not minimizing win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } +done: + release_win_data( data ); } @@ -1254,20 +1261,33 @@ static Bool is_wm_state_notify( Display *display, XEvent *event, XPointer arg ) void wait_for_withdrawn_state( HWND hwnd, BOOL set ) { Display *display = thread_display(); - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data; DWORD end = GetTickCount() + 2000; - if (!data || !data->managed) return; - - TRACE( "waiting for window %p/%lx to become %swithdrawn\n", - data->hwnd, data->whole_window, set ? "" : "not " ); + TRACE( "waiting for window %p to become %swithdrawn\n", hwnd, set ? "" : "not " ); - while (data->whole_window && ((data->wm_state == WithdrawnState) == !set)) + for (;;) { XEvent event; + Window window; int count = 0; - while (XCheckIfEvent( display, &event, is_wm_state_notify, (char *)data->whole_window )) + if (!(data = get_win_data( hwnd ))) break; + if (!data->managed || data->embedded || data->display != display) break; + if (!(window = data->whole_window)) break; + if (!data->mapped == !set) + { + TRACE( "window %p/%lx now %smapped\n", hwnd, window, data->mapped ? "" : "un" ); + break; + } + if ((data->wm_state == WithdrawnState) != !set) + { + TRACE( "window %p/%lx state now %d\n", hwnd, window, data->wm_state ); + break; + } + release_win_data( data ); + + while (XCheckIfEvent( display, &event, is_wm_state_notify, (char *)window )) { count++; if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ @@ -1284,12 +1304,12 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) pfd.events = POLLIN; if (timeout <= 0 || poll( &pfd, 1, timeout ) != 1) { - FIXME( "window %p/%lx wait timed out\n", data->hwnd, data->whole_window ); - break; + FIXME( "window %p/%lx wait timed out\n", hwnd, window ); + return; } } } - TRACE( "window %p/%lx state now %d\n", data->hwnd, data->whole_window, data->wm_state ); + release_win_data( data ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4ccf067..931f60e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1068,24 +1068,31 @@ static void set_xembed_flags( struct x11drv_win_data *data, unsigned long flags */ static void map_window( HWND hwnd, DWORD new_style ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - - TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); - - remove_startup_notification( data->display, data->whole_window ); + struct x11drv_win_data *data; wait_for_withdrawn_state( hwnd, TRUE ); - if (!data->embedded) + if (!(data = get_win_data( hwnd ))) return; + + if (data->whole_window && !data->mapped) { - update_net_wm_states( data ); - sync_window_style( data ); - XMapWindow( data->display, data->whole_window ); - } - else set_xembed_flags( data, XEMBED_MAPPED ); + TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); - data->mapped = TRUE; - data->iconic = (new_style & WS_MINIMIZE) != 0; + remove_startup_notification( data->display, data->whole_window ); + set_wm_hints( data ); + + if (!data->embedded) + { + update_net_wm_states( data ); + sync_window_style( data ); + XMapWindow( data->display, data->whole_window ); + } + else set_xembed_flags( data, XEMBED_MAPPED ); + + data->mapped = TRUE; + data->iconic = (new_style & WS_MINIMIZE) != 0; + } + release_win_data( data ); } @@ -1094,20 +1101,24 @@ static void map_window( HWND hwnd, DWORD new_style ) */ static void unmap_window( HWND hwnd ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data; - TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); + wait_for_withdrawn_state( hwnd, FALSE ); + + if (!(data = get_win_data( hwnd ))) return; - if (!data->embedded) + if (data->mapped) { - wait_for_withdrawn_state( hwnd, FALSE ); - if (!data->managed) XUnmapWindow( data->display, data->whole_window ); + TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); + + if (data->embedded) set_xembed_flags( data, 0 ); + else if (!data->managed) XUnmapWindow( data->display, data->whole_window ); else XWithdrawWindow( data->display, data->whole_window, DefaultScreen(data->display) ); - } - else set_xembed_flags( data, 0 ); - data->mapped = FALSE; - data->net_wm_state = 0; + data->mapped = FALSE; + data->net_wm_state = 0; + } + release_win_data( data ); } @@ -1116,21 +1127,23 @@ static void unmap_window( HWND hwnd ) */ void make_window_embedded( HWND hwnd ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - BOOL was_mapped = data->mapped; + struct x11drv_win_data *data = get_win_data( hwnd ); - /* the window cannot be mapped before being embedded */ - if (data->mapped) unmap_window( hwnd ); + if (!data) return; + /* the window cannot be mapped before being embedded */ + if (data->mapped) + { + if (data->managed) XUnmapWindow( data->display, data->whole_window ); + else XWithdrawWindow( data->display, data->whole_window, DefaultScreen(data->display) ); + data->net_wm_state = 0; + } data->embedded = TRUE; data->managed = TRUE; SetPropA( hwnd, managed_prop, (HANDLE)1 ); sync_window_style( data ); - - if (was_mapped) - map_window( hwnd, 0 ); - else - set_xembed_flags( data, 0 ); + set_xembed_flags( data, data->mapped ? XEMBED_MAPPED : 0 ); + release_win_data( data ); } @@ -2161,7 +2174,6 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags { make_owner_managed( hwnd ); if (!data->icon_pixmap) fetch_icon_data( hwnd, 0, 0 ); - set_wm_hints( data ); map_window( hwnd, new_style ); } else if ((swp_flags & SWP_STATECHANGED) && (!data->iconic != !(new_style & WS_MINIMIZE)))

1 0

Jacek Caban : include: Added uiautomationcore.idl.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 021cab2882b59a7b9ab2fd224e16016803f51630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=021cab2882b59a7b9ab2fd224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 21 11:16:06 2012 +0200 include: Added uiautomationcore.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/uiautomationcore.idl | 91 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 6baea7d..e652488 100644 --- a/.gitignore +++ b/.gitignore @@ -240,6 +240,7 @@ include/structuredquerycondition.h include/textstor.h include/tlogstg.h include/tom.h +include/uiautomationcore.h include/unknwn.h include/urlhist.h include/urlmon.h diff --git a/include/Makefile.in b/include/Makefile.in index 37f2c62..a4f00a3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -97,6 +97,7 @@ PUBLIC_IDL_H_SRCS = \ textstor.idl \ tlogstg.idl \ tom.idl \ + uiautomationcore.idl \ unknwn.idl \ urlhist.idl \ urlmon.idl \ diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl new file mode 100644 index 0000000..3ae6dac --- /dev/null +++ b/include/uiautomationcore.idl @@ -0,0 +1,91 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define DO_NO_IMPORTS +import "oaidl.idl"; +import "oleacc.idl"; + +enum ProviderOptions { + ProviderOptions_ClientSideProvider = 0x0001, + ProviderOptions_ServerSideProvider = 0x0002, + ProviderOptions_NonClientAreaProvider = 0x0004, + ProviderOptions_OverrideProvider = 0x0008, + ProviderOptions_ProviderOwnsSetFocus = 0x0010, + ProviderOptions_UseComThreading = 0x0020 +}; + +typedef int PROPERTYID; +typedef int PATTERNID; +typedef int EVENTID; +typedef int TEXTATTRIBUTEID; +typedef int CONTROLTYPEID; + +[ + version(1.0), + uuid(930299ce-9965-4dec-b0f4-a54848d4b667), + lcid(0), + hidden +] +library UIA +{ + importlib("stdole2.tlb"); + + [ + object, + uuid(d6dd68d1-86fd-4332-8666-9abedea2d24c), + pointer_default(unique) + ] + interface IRawElementProviderSimple : IUnknown + { + [propget] HRESULT ProviderOptions([out, retval] enum ProviderOptions *pRetVal); + + HRESULT GetPatternProvider( + [in] PATTERNID patternId, + [out, retval] IUnknown **pRetVal); + + HRESULT GetPropertyValue( + [in] PROPERTYID propertyId, + [out, retval] VARIANT *pRetVal); + + [propget] HRESULT HostRawElementProvider([out, retval] IRawElementProviderSimple **pRetVal); + } + + [ + object, + uuid(f8b80ada-2c44-48d0-89be-5ff23c9cd875), + pointer_default(unique), + oleautomation + ] + interface IAccessibleEx : IUnknown + { + HRESULT GetObjectForChild( + [in] long idChild, + [out, retval] IAccessibleEx **pRetVal); + + HRESULT GetIAccessiblePair( + [out] IAccessible **ppAcc, + [out] long *pidChild); + + HRESULT GetRuntimeId( + [out, retval] SAFEARRAY(int) *pRetVal); + + HRESULT ConvertReturnedElement( + [in] IRawElementProviderSimple *pIn, + [out] IAccessibleEx **ppRetValOut); + } +}

1 0

Jacek Caban : atliface.idl: Added IRegistrarBase declaration.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 0c143845891ebf1b622026836b94dfd383aa1870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c143845891ebf1b622026836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 21 13:45:55 2012 +0200 atliface.idl: Added IRegistrarBase declaration. --- dlls/atl/registrar.c | 4 +++- include/atliface.idl | 14 +++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 4fcf28d..7b1fe30 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -543,7 +543,9 @@ static HRESULT WINAPI Registrar_QueryInterface(IRegistrar *iface, REFIID riid, v { TRACE("(%p)->(%s %p\n", iface, debugstr_guid(riid), ppvObject); - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IRegistrar, riid)) { + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IRegistrar, riid) + || IsEqualGUID(&IID_IRegistrarBase, riid)) { IRegistrar_AddRef(iface); *ppvObject = iface; return S_OK; diff --git a/include/atliface.idl b/include/atliface.idl index cbdae28..78d8518 100644 --- a/include/atliface.idl +++ b/include/atliface.idl @@ -24,17 +24,25 @@ cpp_quote("#endif") [ object, - oleautomation, - uuid(44EC053B-400F-11D0-9DCD-00A0C90391D3) + uuid(e21f8a85-b05d-4243-8183-c7cb405588f7), + pointer_default(unique) ] -interface IRegistrar : IUnknown +interface IRegistrarBase : IUnknown { HRESULT AddReplacement( [in] LPCOLESTR Key, [in] LPCOLESTR item); HRESULT ClearReplacements(); +} +[ + object, + uuid(44EC053B-400F-11D0-9DCD-00A0C90391D3), + pointer_default(unique) +] +interface IRegistrar : IRegistrarBase +{ HRESULT ResourceRegisterSz( [in] LPCOLESTR resFileName, [in] LPCOLESTR szID,

1 0

Dmitry Timoshkov : gdiplus: Test GIF properties using a specially created GIF image with a bunch of extensions .
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: d8d4bffb39e4cb3ba0490b32770ae854262c6403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d4bffb39e4cb3ba0490b327… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 21 19:56:21 2012 +0900 gdiplus: Test GIF properties using a specially created GIF image with a bunch of extensions. --- dlls/gdiplus/tests/image.c | 48 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e373a8c..a26c4f5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3920,18 +3920,42 @@ static void test_DrawImage_scale(void) expect(Ok, status); } +static const BYTE animatedgif[] = { +'G','I','F','8','9','a',0x01,0x00,0x01,0x00,0xA1,0x02,0x00, +0x6F,0x6F,0x6F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +/*0x21,0xFF,0x0B,'A','N','I','M','E','X','T','S','1','.','0',*/ +0x21,0xFF,0x0B,'N','E','T','S','C','A','P','E','2','.','0', +0x03,0x01,0x05,0x00,0x00, +0x21,0xFE,0x0C,'H','e','l','l','o',' ','W','o','r','l','d','!',0x00, +0x21,0x01,0x0D,'a','n','i','m','a','t','i','o','n','.','g','i','f',0x00, +0x21,0xF9,0x04,0xff,0x0A,0x00,0x08,0x00, +0x2C,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, +0xDE,0xDE,0xDE,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x4C,0x01,0x00, +0x21,0xFE,0x08,'i','m','a','g','e',' ','#','1',0x00, +0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','1',0x00, +0x21,0xF9,0x04,0x00,0x14,0x00,0x01,0x00, +0x2C,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, +0x4D,0x4D,0x4D,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x44,0x01,0x00, +0x21,0xFE,0x08,'i','m','a','g','e',' ','#','2',0x00, +0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','2',0x00,0x3B +}; + static void test_gif_properties(void) { static const struct test_data { ULONG type, id, length; - const BYTE value[12]; + const BYTE value[13]; } td[] = { - { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,10,0,0,0 } }, - { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1 } }, - { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0,0,0,0xff,0xff,0xff,0,0,0,0,0 } }, - { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 0 } } + { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,20,0,0,0 } }, + { PropertyTagTypeASCII, PropertyTagExifUserComment, 13, { 'H','e','l','l','o',' ','W','o','r','l','d','!',0 } }, + { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 5,0 } }, + { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0x6f,0x6f,0x6f,0,0,0,0,0,0,0,0,0 } }, + { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 2 } }, + { PropertyTagTypeByte, PropertyTagIndexTransparent, 1, { 8 } } }; GpStatus status; GpImage *image; @@ -3940,9 +3964,12 @@ static void test_gif_properties(void) PROPID *prop_id; PropertyItem *prop_item; - image = load_image(gifanimation, sizeof(gifanimation)); - ok(image != 0, "Failed to load GIF image data\n"); - if (!image) return; + image = load_image(animatedgif, sizeof(animatedgif)); + if (!image) /* XP fails to load this GIF image */ + { + trace("Failed to load GIF image data\n"); + return; + } status = GdipImageGetFrameDimensionsCount(image, &dim_count); expect(Ok, status); @@ -3956,6 +3983,9 @@ static void test_gif_properties(void) expect(Ok, status); expect(2, frame_count); + status = GdipImageSelectActiveFrame(image, &guid, 1); + expect(Ok, status); + status = GdipGetPropertyCount(image, &prop_count); expect(Ok, status); todo_wine @@ -3994,7 +4024,7 @@ todo_wine if (td[i].length == prop_item->length) { int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; - ok(match || broken(td[i].length <= 4 && !match), "%u: data mismatch\n", i); + ok(match, "%u: data mismatch\n", i); if (!match) { UINT j;

1 0

Dmitry Timoshkov : gdiplus: Add more tests for GIF image properties.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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

Sept. 21, 2012

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 : include: Add missing structure members.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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

Sept. 21, 2012

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: Only copy the valid portion of the structure.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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