wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Hans Leidekker : include: Avoid redefinition of EVENT_FILTER_DESCRIPTOR.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: c185757993095382cc7580ac78d27f08c523e9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c185757993095382cc7580ac7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 11:53:41 2016 +0200 include: Avoid redefinition of EVENT_FILTER_DESCRIPTOR. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/evntrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/evntrace.h b/include/evntrace.h index 6ebcfba..b54cd11 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -248,7 +248,7 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; -typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; +typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR; typedef struct _ENABLE_TRACE_PARAMETERS {

1 0

Alexandre Julliard : explorer: Add a helper function to send systray notifications.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: b147bd63e39c73ffd5711c2c3209726271a6345f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b147bd63e39c73ffd5711c2c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 10:57:45 2016 +0200 explorer: Add a helper function to send systray notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 84 +++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 48 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index f4801b7..b3c192a 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -716,6 +716,29 @@ static void do_hide_systray(void) 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); } +static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt ) +{ + WPARAM wp = icon->id; + LPARAM lp = msg; + + if (icon->version >= NOTIFY_VERSION_4) + { + ClientToScreen( tray_window, &pt ); + wp = MAKEWPARAM( pt.x, pt.y ); + lp = MAKELPARAM( msg, icon->id ); + } + + TRACE( "relaying 0x%x\n", msg ); + if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) && + (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + { + WARN( "application window was destroyed, removing icon %u\n", icon->id ); + delete_icon( icon ); + return FALSE; + } + return TRUE; +} + static void do_show_systray(void) { SIZE size; @@ -795,65 +818,30 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: { - WPARAM wpar; - BOOL oldver; - BOOL ret; MSG message; - struct icon *icon = icon_from_point( (short)LOWORD(lparam), (short)HIWORD(lparam) ); + POINT pt = { (short)LOWORD(lparam), (short)HIWORD(lparam) }; + struct icon *icon = icon_from_point( pt.x, pt.y ); if (!icon) break; - /* notify the owner hwnd of the message */ - WINE_TRACE("relaying 0x%x\n", msg); - message.hwnd = hwnd; message.message = msg; message.wParam = wparam; message.lParam = lparam; SendMessageW( icon->tooltip, TTM_RELAYEVENT, 0, (LPARAM)&message ); - oldver = icon->version <= NOTIFY_VERSION; - if (oldver) { - /* 0 up to NOTIFYICON_VERSION (=3) */ - wpar = icon->id; - } else { - /* NOTIFYICON_VERSION_4 */ - RECT rect; - WORD x, y; - - rect = get_icon_rect( icon ); - MapWindowPoints( tray_window, 0, (POINT *)&rect, 2 ); - x = rect.left + LOWORD(lparam); - y = rect.top + HIWORD(lparam); - wpar = MAKEWPARAM(x, y); - } - - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? msg : MAKELPARAM(msg, icon->id)); - - if (ret && icon->version > 0) { - switch (msg) { - case WM_RBUTTONUP: - /* notify the owner hwnd of the message */ - WINE_TRACE("relaying 0x%x\n", WM_CONTEXTMENU); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? WM_CONTEXTMENU : MAKELPARAM(WM_CONTEXTMENU, icon->id)); - break; - case WM_LBUTTONUP: - /* notify the owner hwnd of the message */ - WINE_TRACE("relaying 0x%x\n", NIN_SELECT); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? NIN_SELECT : MAKELPARAM(NIN_SELECT, icon->id)); - break; - default: - break; - } - } + if (!notify_owner( icon, msg, pt )) break; - if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + if (icon->version > 0) { - WINE_WARN("application window was destroyed without removing " - "notification icon, removing automatically\n"); - delete_icon( icon ); + switch (msg) + { + case WM_RBUTTONUP: + notify_owner( icon, WM_CONTEXTMENU, pt ); + break; + case WM_LBUTTONUP: + notify_owner( icon, NIN_SELECT, pt ); + break; + } } break; }

1 0

Alexandre Julliard : winex11: Add a helper function to send systray notifications.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 2e3aa622641238bf5a416ad350779c33a7be4ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3aa622641238bf5a416ad35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 10:57:34 2016 +0200 winex11: Add a helper function to send systray notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 86 +++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 51 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index fab10c6..815e554 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -436,11 +436,35 @@ done: if (dib) DeleteObject( dib ); } +static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam ) +{ + WPARAM wp = icon->id; + LPARAM lp = msg; + + if (icon->version >= NOTIFY_VERSION_4) + { + POINT pt = { (short)LOWORD(lparam), (short)HIWORD(lparam) }; + + ClientToScreen( icon->window, &pt ); + wp = MAKEWPARAM( pt.x, pt.y ); + lp = MAKELPARAM( msg, icon->id ); + } + + TRACE( "relaying 0x%x\n", msg ); + if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) && + (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + { + WARN( "application window was destroyed, removing icon %u\n", icon->id ); + delete_icon( icon ); + return FALSE; + } + return TRUE; +} + /* window procedure for the individual tray icon window */ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { struct tray_icon *icon = NULL; - BOOL ret; TRACE("hwnd=%p, msg=0x%x\n", hwnd, msg); @@ -477,64 +501,24 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_MOUSEMOVE: case WM_LBUTTONDOWN: - case WM_LBUTTONUP: case WM_RBUTTONDOWN: - case WM_RBUTTONUP: case WM_MBUTTONDOWN: case WM_MBUTTONUP: case WM_LBUTTONDBLCLK: case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: - { - WPARAM wpar; - BOOL oldver; - - oldver = icon->version <= NOTIFY_VERSION; - if (oldver) { - /* 0 up to NOTIFYICON_VERSION (=3) */ - wpar = icon->id; - } else { - /* NOTIFYICON_VERSION_4 */ - RECT rect; - WORD x, y; - - GetWindowRect( icon->window, &rect ); - x = rect.left + LOWORD(lparam); - y = rect.top + HIWORD(lparam); - wpar = MAKEWPARAM(x, y); - } + notify_owner( icon, msg, lparam ); + break; - /* notify the owner hwnd of the message */ - TRACE("relaying 0x%x\n", msg); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? msg : MAKELPARAM(msg, icon->id)); - - if (ret && icon->version > 0) { - switch (msg) { - case WM_RBUTTONUP: - /* notify the owner hwnd of the message */ - TRACE("relaying 0x%x\n", WM_CONTEXTMENU); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? WM_CONTEXTMENU : MAKELPARAM(WM_CONTEXTMENU, icon->id)); - break; - case WM_LBUTTONUP: - /* notify the owner hwnd of the message */ - TRACE("relaying 0x%x\n", NIN_SELECT); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? NIN_SELECT : MAKELPARAM(NIN_SELECT, icon->id)); - break; - default: - break; - } - } + case WM_LBUTTONUP: + if (!notify_owner( icon, msg, lparam )) break; + if (icon->version > 0) notify_owner( icon, NIN_SELECT, lparam ); + break; - if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) - { - WARN( "application window was destroyed, removing icon %u\n", icon->id ); - delete_icon( icon ); - } - return 0; - } + case WM_RBUTTONUP: + if (!notify_owner( icon, msg, lparam )) break; + if (icon->version > 0) notify_owner( icon, WM_CONTEXTMENU, lparam ); + break; case WM_WINDOWPOSCHANGED: update_systray_balloon_position();

1 0

Roman Pisl : explorer: Send WM_CONTEXTMENU on WM_RBUTTONUP and NIN_SELECT on WM_LBUTTONUP.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: df8ec3a37125159dbceb1a092d2a109d7aa77727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8ec3a37125159dbceb1a092… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:42 2016 +0200 explorer: Send WM_CONTEXTMENU on WM_RBUTTONUP and NIN_SELECT on WM_LBUTTONUP. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index a08685b..f4801b7 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -830,6 +830,25 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l ret = PostMessageW(icon->owner, icon->callback_message, wpar, oldver ? msg : MAKELPARAM(msg, icon->id)); + if (ret && icon->version > 0) { + switch (msg) { + case WM_RBUTTONUP: + /* notify the owner hwnd of the message */ + WINE_TRACE("relaying 0x%x\n", WM_CONTEXTMENU); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? WM_CONTEXTMENU : MAKELPARAM(WM_CONTEXTMENU, icon->id)); + break; + case WM_LBUTTONUP: + /* notify the owner hwnd of the message */ + WINE_TRACE("relaying 0x%x\n", NIN_SELECT); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? NIN_SELECT : MAKELPARAM(NIN_SELECT, icon->id)); + break; + default: + break; + } + } + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WINE_WARN("application window was destroyed without removing "

1 0

Roman Pisl : winex11: Send WM_CONTEXTMENU on WM_RBUTTONUP and NIN_SELECT on WM_LBUTTONUP.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: fb70cdb41910cae2bea946702d2dce92f9645963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb70cdb41910cae2bea946702… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:41 2016 +0200 winex11: Send WM_CONTEXTMENU on WM_RBUTTONUP and NIN_SELECT on WM_LBUTTONUP. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 794f2c6..fab10c6 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -509,6 +509,25 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR ret = PostMessageW(icon->owner, icon->callback_message, wpar, oldver ? msg : MAKELPARAM(msg, icon->id)); + if (ret && icon->version > 0) { + switch (msg) { + case WM_RBUTTONUP: + /* notify the owner hwnd of the message */ + TRACE("relaying 0x%x\n", WM_CONTEXTMENU); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? WM_CONTEXTMENU : MAKELPARAM(WM_CONTEXTMENU, icon->id)); + break; + case WM_LBUTTONUP: + /* notify the owner hwnd of the message */ + TRACE("relaying 0x%x\n", NIN_SELECT); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? NIN_SELECT : MAKELPARAM(NIN_SELECT, icon->id)); + break; + default: + break; + } + } + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN( "application window was destroyed, removing icon %u\n", icon->id );

1 0

Roman Pisl : explorer: Implement NIM_SETVERSION.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: fcad721081ebd60aa6e9dfcc177a6a45b9d7d072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcad721081ebd60aa6e9dfcc1… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:40 2016 +0200 explorer: Implement NIM_SETVERSION. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 97cffbc..a08685b 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -77,6 +77,7 @@ struct icon UINT info_flags; /* flags for info balloon */ UINT info_timeout; /* timeout for info balloon */ HICON info_icon; /* info balloon icon */ + UINT version; /* notify icon api version */ }; static struct list icon_list = LIST_INIT( icon_list ); @@ -586,6 +587,10 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) case NIM_MODIFY: if (icon) ret = modify_icon( icon, &nid ); break; + case NIM_SETVERSION: + icon->version = nid.u.uVersion; + ret = TRUE; + break; default: WINE_FIXME("unhandled tray message: %ld\n", cds->dwData); break; @@ -790,6 +795,9 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: { + WPARAM wpar; + BOOL oldver; + BOOL ret; MSG message; struct icon *icon = icon_from_point( (short)LOWORD(lparam), (short)HIWORD(lparam) ); if (!icon) break; @@ -803,8 +811,26 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l message.lParam = lparam; SendMessageW( icon->tooltip, TTM_RELAYEVENT, 0, (LPARAM)&message ); - if (!PostMessageW( icon->owner, icon->callback_message, (WPARAM) icon->id, (LPARAM) msg ) && - GetLastError() == ERROR_INVALID_WINDOW_HANDLE) + oldver = icon->version <= NOTIFY_VERSION; + if (oldver) { + /* 0 up to NOTIFYICON_VERSION (=3) */ + wpar = icon->id; + } else { + /* NOTIFYICON_VERSION_4 */ + RECT rect; + WORD x, y; + + rect = get_icon_rect( icon ); + MapWindowPoints( tray_window, 0, (POINT *)&rect, 2 ); + x = rect.left + LOWORD(lparam); + y = rect.top + HIWORD(lparam); + wpar = MAKEWPARAM(x, y); + } + + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? msg : MAKELPARAM(msg, icon->id)); + + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WINE_WARN("application window was destroyed without removing " "notification icon, removing automatically\n");

1 0

Roman Pisl : winex11: Implement NIM_SETVERSION.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 9f774ada6c4f5b1bd3ac56bd47f342758028e97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f774ada6c4f5b1bd3ac56bd4… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:39 2016 +0200 winex11: Implement NIM_SETVERSION. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index c7e7013..794f2c6 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -65,6 +65,7 @@ struct tray_icon UINT info_flags; /* flags for info balloon */ UINT info_timeout; /* timeout for info balloon */ HICON info_icon; /* info balloon icon */ + UINT version; /* notify icon api version */ }; static struct list icon_list = LIST_INIT( icon_list ); @@ -484,15 +485,37 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_LBUTTONDBLCLK: case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: - /* notify the owner hwnd of the message */ - TRACE("relaying 0x%x\n", msg); - ret = PostMessageW(icon->owner, icon->callback_message, icon->id, msg); - if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { - WARN( "application window was destroyed, removing icon %u\n", icon->id ); - delete_icon( icon ); + WPARAM wpar; + BOOL oldver; + + oldver = icon->version <= NOTIFY_VERSION; + if (oldver) { + /* 0 up to NOTIFYICON_VERSION (=3) */ + wpar = icon->id; + } else { + /* NOTIFYICON_VERSION_4 */ + RECT rect; + WORD x, y; + + GetWindowRect( icon->window, &rect ); + x = rect.left + LOWORD(lparam); + y = rect.top + HIWORD(lparam); + wpar = MAKEWPARAM(x, y); + } + + /* notify the owner hwnd of the message */ + TRACE("relaying 0x%x\n", msg); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? msg : MAKELPARAM(msg, icon->id)); + + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + { + WARN( "application window was destroyed, removing icon %u\n", icon->id ); + delete_icon( icon ); + } + return 0; } - return 0; case WM_WINDOWPOSCHANGED: update_systray_balloon_position(); @@ -834,6 +857,13 @@ 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 NIM_SETVERSION: + if ((icon = get_icon( data->hWnd, data->uID ))) + { + icon->version = data->u.uVersion; + ret = TRUE; + } + break; case 0xdead: /* Wine extension: owner window has died */ cleanup_icons( data->hWnd ); break;

1 0

Roman Pisl : shell32: Implement NIM_SETVERSION.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 6d7a32a1075999be44f312210766d992a09c735f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7a32a1075999be44f312210… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:38 2016 +0200 shell32: Implement NIM_SETVERSION. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/systray.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index dfa30ff..a043912 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -234,6 +234,8 @@ noicon: } if (data->uFlags & NIF_GUID) data->guidItem = nid->guidItem; + if (dwMessage == NIM_SETVERSION) + data->u.uVersion = nid->u.uVersion; /* FIXME: balloon icon */ cds.lpData = data;

1 0

Sebastian Lackner : user32/tests: Fix test failures on 64-bit testbot VMs.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: cf0f7fcfd53d57cd5aa5fed09dd14890144a034c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0f7fcfd53d57cd5aa5fed09… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 11 18:11:19 2016 +0200 user32/tests: Fix test failures on 64-bit testbot VMs. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 69bdba8..17fc028 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1737,7 +1737,10 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( 0xdeadbeef, hfixed ); ok( h == hfixed, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); +#ifndef _WIN64 + /* testing if hfixed2 is freed triggers an exception on Win64 */ ok( is_freed( hfixed2 ) || broken( !is_freed( hfixed2 )) /* < Vista */, "expected freed mem %p\n", hfixed2 ); +#endif r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Vincent Povirk : gdiplus: Implement EMR_EXTSELECTCLIPRGN playback.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 069f20d1b30f745f284d3776d63974577422b8d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069f20d1b30f745f284d3776d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 11 11:06:56 2016 -0500 gdiplus: Implement EMR_EXTSELECTCLIPRGN playback. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 32cd04e..69d8a16 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1040,21 +1040,27 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } -static GpStatus METAFILE_PlaybackUpdateGdiTransform(GpMetafile *metafile) +static void METAFILE_GetFinalGdiTransform(const GpMetafile *metafile, XFORM *result) { - XFORM combined, final; const GpRectF *rect; const GpPointF *pt; /* This transforms metafile device space to output points. */ rect = &metafile->src_rect; pt = metafile->playback_points; - final.eM11 = (pt[1].X - pt[0].X) / rect->Width; - final.eM21 = (pt[2].X - pt[0].X) / rect->Height; - final.eDx = pt[0].X - final.eM11 * rect->X - final.eM21 * rect->Y; - final.eM12 = (pt[1].Y - pt[0].Y) / rect->Width; - final.eM22 = (pt[2].Y - pt[0].Y) / rect->Height; - final.eDy = pt[0].Y - final.eM12 * rect->X - final.eM22 * rect->Y; + result->eM11 = (pt[1].X - pt[0].X) / rect->Width; + result->eM21 = (pt[2].X - pt[0].X) / rect->Height; + result->eDx = pt[0].X - result->eM11 * rect->X - result->eM21 * rect->Y; + result->eM12 = (pt[1].Y - pt[0].Y) / rect->Width; + result->eM22 = (pt[2].Y - pt[0].Y) / rect->Height; + result->eDy = pt[0].Y - result->eM12 * rect->X - result->eM22 * rect->Y; +} + +static GpStatus METAFILE_PlaybackUpdateGdiTransform(GpMetafile *metafile) +{ + XFORM combined, final; + + METAFILE_GetFinalGdiTransform(metafile, &final); CombineTransform(&combined, &metafile->gdiworldtransform, &final); @@ -1154,7 +1160,6 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, case EMR_SETWINDOWEXTEX: case EMR_SETVIEWPORTORGEX: case EMR_SETVIEWPORTEXTEX: - case EMR_EXTSELECTCLIPRGN: case EMR_SCALEVIEWPORTEXTEX: case EMR_SCALEWINDOWEXTEX: case EMR_MODIFYWORLDTRANSFORM: @@ -1167,6 +1172,28 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, METAFILE_PlaybackUpdateGdiTransform(real_metafile); break; } + case EMR_EXTSELECTCLIPRGN: + { + DWORD rgndatasize = *(DWORD*)data; + DWORD mode = *(DWORD*)(data + 4); + const RGNDATA *rgndata = (const RGNDATA*)(data + 8); + HRGN hrgn = NULL; + + if (dataSize > 8) + { + XFORM final; + + METAFILE_GetFinalGdiTransform(metafile, &final); + + hrgn = ExtCreateRegion(&final, rgndatasize, rgndata); + } + + ExtSelectClipRgn(metafile->playback_dc, hrgn, mode); + + DeleteObject(hrgn); + + return Ok; + } default: break; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016