winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2015
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
775 discussions
Start a n
N
ew thread
Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetTags().
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: fd4b0532d0b5a2d35f9036142451d4e75eee3a3a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fd4b0532d0b5a2d35f9036142…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:05 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetTags(). --- dlls/d2d1/render_target.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index b6e68dc..ae82550 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -904,10 +904,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *i static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - *tag1 = 0; - *tag2 = 0; + *tag1 = render_target->tag1; + *tag2 = render_target->tag2; } static void STDMETHODCALLTYPE d2d_d3d_render_target_PushLayer(ID2D1RenderTarget *iface,
1
0
0
0
Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetTags().
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: e52cf640e67cfc9534637a3ce8a0a002129563f0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e52cf640e67cfc9534637a3ce…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:04 2015 +0100 d2d1: Implement d2d_d3d_render_target_SetTags(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 853414f..870e521 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -66,6 +66,7 @@ struct d2d_d3d_render_target D2D1_ANTIALIAS_MODE antialias_mode; D2D1_TEXT_ANTIALIAS_MODE text_antialias_mode; + D2D1_TAG tag1, tag2; IDWriteRenderingParams *text_rendering_params; D2D1_SIZE_U pixel_size; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0d956c4..b6e68dc 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -894,7 +894,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1 static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *iface, D2D1_TAG tag1, D2D1_TAG tag2) { - FIXME("iface %p, tag1 %s, tag2 %s stub!\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2)); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, tag1 %s, tag2 %s.\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2)); + + render_target->tag1 = tag1; + render_target->tag2 = tag2; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2)
1
0
0
0
Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetTextAntialiasMode ().
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: 2f529b125546ff69fc856640598aa8d3873ba036 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2f529b125546ff69fc8566405…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:03 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetTextAntialiasMode(). --- dlls/d2d1/render_target.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4b78967..0d956c4 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -860,9 +860,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1Re static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextAntialiasMode(ID2D1RenderTarget *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p.\n", iface); - return D2D1_TEXT_ANTIALIAS_MODE_DEFAULT; + return render_target->text_antialias_mode; } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1RenderTarget *iface,
1
0
0
0
Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetTextAntialiasMode ().
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: 345dbdc77fcd541d22d29c089dc07fd9f48b798b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=345dbdc77fcd541d22d29c089…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:02 2015 +0100 d2d1: Implement d2d_d3d_render_target_SetTextAntialiasMode(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e82d23c..853414f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -65,6 +65,7 @@ struct d2d_d3d_render_target ID3D10PixelShader *rect_bitmap_ps; D2D1_ANTIALIAS_MODE antialias_mode; + D2D1_TEXT_ANTIALIAS_MODE text_antialias_mode; IDWriteRenderingParams *text_rendering_params; D2D1_SIZE_U pixel_size; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 97d5607..4b78967 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -851,7 +851,11 @@ static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasM static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1RenderTarget *iface, D2D1_TEXT_ANTIALIAS_MODE antialias_mode) { - FIXME("iface %p, antialias_mode %#x stub!\n", iface, antialias_mode); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode); + + render_target->text_antialias_mode = antialias_mode; } static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextAntialiasMode(ID2D1RenderTarget *iface)
1
0
0
0
Alexandre Julliard : winex11: Cleanup system tray icons when their owner is destroyed instead of polling.
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: 86748a8480d846c500c42e3e6f03e628111d4da6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=86748a8480d846c500c42e3e6…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 17:14:16 2015 +0900 winex11: Cleanup system tray icons when their owner is destroyed instead of polling. --- dlls/winex11.drv/systray.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index a694610..c7e7013 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -85,11 +85,9 @@ Atom systray_atom = 0; #define MIN_DISPLAYED 8 #define ICON_BORDER 2 -#define VALID_WIN_TIMER 1 -#define BALLOON_CREATE_TIMER 2 -#define BALLOON_SHOW_TIMER 3 +#define BALLOON_CREATE_TIMER 1 +#define BALLOON_SHOW_TIMER 2 -#define VALID_WIN_TIMEOUT 2000 #define BALLOON_CREATE_TIMEOUT 2000 #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 @@ -453,10 +451,6 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR switch (msg) { - case WM_CREATE: - SetTimer( hwnd, VALID_WIN_TIMER, VALID_WIN_TIMEOUT, NULL ); - break; - case WM_SIZE: if (icon->window && icon->layered) repaint_tray_icon( icon ); break; @@ -507,9 +501,6 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_TIMER: switch (wparam) { - case VALID_WIN_TIMER: - if (!IsWindow( icon->owner )) delete_icon( icon ); - break; case BALLOON_CREATE_TIMER: balloon_create_timer( icon ); break; @@ -811,6 +802,15 @@ static BOOL delete_icon( struct tray_icon *icon ) return TRUE; } +/* cleanup all icons for a given window */ +static void cleanup_icons( HWND owner ) +{ + struct tray_icon *this, *next; + + LIST_FOR_EACH_ENTRY_SAFE( this, next, &icon_list, struct tray_icon, entry ) + if (this->owner == owner) delete_icon( this ); +} + /*********************************************************************** * wine_notify_icon (X11DRV.@) @@ -834,6 +834,9 @@ int CDECL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) case NIM_MODIFY: if ((icon = get_icon( data->hWnd, data->uID ))) ret = modify_icon( icon, data ); break; + case 0xdead: /* Wine extension: owner window has died */ + cleanup_icons( data->hWnd ); + break; default: FIXME( "unhandled tray message: %u\n", msg ); break;
1
0
0
0
Alexandre Julliard : explorer: Cleanup system tray icons when their owner is destroyed instead of polling.
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: aceec41e932d92cfe5eeb6be0ee0dfabede645fc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aceec41e932d92cfe5eeb6be0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 17:13:32 2015 +0900 explorer: Cleanup system tray icons when their owner is destroyed instead of polling. --- programs/explorer/desktop.c | 4 ++++ programs/explorer/explorer_private.h | 11 ++++++----- programs/explorer/systray.c | 21 +++++++++++---------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 474e93e..29ef8d7 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -529,6 +529,10 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); return 0; + case WM_PARENTNOTIFY: + if (LOWORD(wp) == WM_DESTROY) cleanup_systray_window( (HWND)lp ); + return 0; + case WM_LBUTTONDBLCLK: if (!using_root) { diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index 49400cd..dbe50be 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -21,10 +21,11 @@ #ifndef __WINE_EXPLORER_PRIVATE_H #define __WINE_EXPLORER_PRIVATE_H -extern void manage_desktop( WCHAR *arg ); -extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ); -extern void initialize_appbar(void); -extern void do_startmenu( HWND owner ); -extern LRESULT menu_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); +extern void manage_desktop( WCHAR *arg ) DECLSPEC_HIDDEN; +extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ) DECLSPEC_HIDDEN; +extern void initialize_appbar(void) DECLSPEC_HIDDEN; +extern void cleanup_systray_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern void do_startmenu( HWND owner ) DECLSPEC_HIDDEN; +extern LRESULT menu_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; #endif /* __WINE_EXPLORER_PRIVATE_H */ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 2a6ff14..beb0a88 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -97,11 +97,9 @@ static HWND start_button; #define MIN_DISPLAYED 8 #define ICON_BORDER 2 -#define VALID_WIN_TIMER 1 -#define BALLOON_CREATE_TIMER 2 -#define BALLOON_SHOW_TIMER 3 +#define BALLOON_CREATE_TIMER 1 +#define BALLOON_SHOW_TIMER 2 -#define VALID_WIN_TIMEOUT 2000 #define BALLOON_CREATE_TIMEOUT 2000 #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 @@ -430,7 +428,6 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) icon->owner = nid->hWnd; icon->display = -1; - if (list_empty( &icon_list )) SetTimer( tray_window, VALID_WIN_TIMER, VALID_WIN_TIMEOUT, NULL ); list_add_tail(&icon_list, &icon->entry); return modify_icon( icon, nid ); @@ -443,17 +440,22 @@ static BOOL delete_icon(struct icon *icon) list_remove(&icon->entry); DestroyIcon(icon->image); HeapFree(GetProcessHeap(), 0, icon); - if (list_empty( &icon_list )) KillTimer( tray_window, VALID_WIN_TIMER ); return TRUE; } -/* cleanup icons belonging to windows that have been destroyed */ -static void cleanup_destroyed_windows(void) +/* cleanup icons belonging to a window that has been destroyed */ +void cleanup_systray_window( HWND hwnd ) { struct icon *icon, *next; LIST_FOR_EACH_ENTRY_SAFE( icon, next, &icon_list, struct icon, entry ) - if (!IsWindow( icon->owner )) delete_icon( icon ); + if (icon->owner == hwnd) delete_icon( icon ); + + if (wine_notify_icon) + { + NOTIFYICONDATAW nid = { sizeof(nid), hwnd }; + wine_notify_icon( 0xdead, &nid ); + } } static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) @@ -561,7 +563,6 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_TIMER: switch (wparam) { - case VALID_WIN_TIMER: cleanup_destroyed_windows(); break; case BALLOON_CREATE_TIMER: balloon_create_timer(); break; case BALLOON_SHOW_TIMER: balloon_timer(); break; }
1
0
0
0
Alexandre Julliard : server: Post a notification to the desktop window when a top-level window is destroyed.
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: 7c538cddebf58c91bee071e028e9f67d1355c9da URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7c538cddebf58c91bee071e02…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 17:12:26 2015 +0900 server: Post a notification to the desktop window when a top-level window is destroyed. --- server/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/window.c b/server/window.c index 9efdd69..d089149 100644 --- a/server/window.c +++ b/server/window.c @@ -1865,6 +1865,11 @@ void destroy_window( struct window *win ) if (desktop->top_window == win) desktop->top_window = NULL; else desktop->msg_window = NULL; } + else if (is_desktop_window( win->parent )) + { + post_message( win->parent->handle, WM_PARENTNOTIFY, WM_DESTROY, win->handle ); + } + detach_window_thread( win ); if (win->win_region) free_region( win->win_region ); if (win->update_region) free_region( win->update_region );
1
0
0
0
Vincent Povirk : gdiplus: Add support for reading PNG tEXt metadata.
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: 3b51859871513262770562bfd5d5f5447b20c7a1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3b51859871513262770562bfd…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 25 16:34:35 2015 -0500 gdiplus: Add support for reading PNG tEXt metadata. --- dlls/gdiplus/image.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 77b9305..de03096 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3417,6 +3417,101 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICBitmapFrameDecode_Release(frame); } +static PropertyItem* create_prop(PROPID propid, PROPVARIANT* value) +{ + PropertyItem *item = NULL; + 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, propid) != Ok) + { + GdipFree(item); + item = NULL; + } + } + + return item; +} + +static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +{ + HRESULT hr; + IWICBitmapFrameDecode *frame; + IWICMetadataBlockReader *block_reader; + IWICMetadataReader *reader; + UINT block_count, i, j; + struct keyword_info { + const char* name; + PROPID propid; + BOOL seen; + } keywords[] = { + { "Title", PropertyTagImageTitle }, + { "Author", PropertyTagArtist }, + { "Description", PropertyTagImageDescription }, + { "Copyright", PropertyTagCopyright }, + { "Software", PropertyTagSoftwareUsed }, + { "Source", PropertyTagEquipModel }, + { "Comment", PropertyTagExifUserComment }, + }; + + hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &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) + { + GUID format; + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunktEXt, &format)) + { + PROPVARIANT name, value; + PropertyItem* item; + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, &name, &value); + + if (SUCCEEDED(hr)) + { + if (name.vt == VT_LPSTR) + { + for (j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++) + if (!strcmp(keywords[j].name, name.u.pszVal)) + break; + if (j < sizeof(keywords)/sizeof(keywords[0]) && !keywords[j].seen) + { + keywords[j].seen = TRUE; + item = create_prop(keywords[j].propid, &value); + if (item) + add_property(bitmap, item); + } + } + + PropVariantClear(&name); + PropVariantClear(&value); + } + } + + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + IWICBitmapFrameDecode_Release(frame); +} + static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICBitmapDecoder **decoder) { IWICImagingFactory *factory; @@ -3805,7 +3900,7 @@ static GpStatus decode_image_jpeg(IStream* stream, GpImage **image) static GpStatus decode_image_png(IStream* stream, GpImage **image) { - return decode_image_wic(stream, &GUID_ContainerFormatPng, NULL, image); + return decode_image_wic(stream, &GUID_ContainerFormatPng, png_metadata_reader, image); } static GpStatus decode_image_gif(IStream* stream, GpImage **image)
1
0
0
0
Alexandre Julliard : dsound: Fix an error return code.
by Alexandre Julliard
27 Mar '15
27 Mar '15
Module: wine Branch: master Commit: 8427c7816dbb7495661f86a9543ca484e3923ea2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8427c7816dbb7495661f86a95…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 11:33:50 2015 +0900 dsound: Fix an error return code. --- dlls/dsound/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 4e84d17..d735dc3 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -850,7 +850,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 TRACE("(%p,%s,%u,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject); if (dwIndex >= This->num_filters) - return DSERR_OBJECTNOTFOUND; + return DSERR_CONTROLUNAVAIL; if (!ppObject) return E_INVALIDARG;
1
0
0
0
Francois Gouget : riched20: Mark internal symbols with hidden visibility.
by Alexandre Julliard
26 Mar '15
26 Mar '15
Module: wine Branch: master Commit: 4eedf6a4b3d1e28c4d4c8cf054acdbf8669530f3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4eedf6a4b3d1e28c4d4c8cf05…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:30:34 2015 +0100 riched20: Mark internal symbols with hidden visibility. --- dlls/riched20/editstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 1b1eda6..57d7fef 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -51,7 +51,7 @@ #include "wine/list.h" #ifdef __i386__ -extern const struct ITextHostVtbl itextHostStdcallVtbl; +extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; #endif /* __i386__ */ typedef struct tagME_String
1
0
0
0
← Newer
1
...
8
9
10
11
12
13
14
...
78
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
Results per page:
10
25
50
100
200