December 2010 - Wine-commits

Alexandre Julliard : explorer: Store information needed for the info balloon in the tray icon structure.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: d2e047612ca0be331c14f89afe7d6549626b726b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e047612ca0be331c14f89af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 16:31:12 2010 +0100 explorer: Store information needed for the info balloon in the tray icon structure. --- programs/explorer/systray.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 0acf95e..1b55664 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -65,10 +65,16 @@ struct icon HICON image; /* the image to render */ HWND owner; /* the HWND passed in to the Shell_NotifyIcon call */ HWND tooltip; /* Icon tooltip */ + UINT state; /* state flags */ UINT id; /* the unique id given by the app */ UINT callback_message; int display; /* index in display list, or -1 if hidden */ WCHAR tiptext[128]; /* Tooltip text. If empty => tooltip disabled */ + WCHAR info_text[256]; /* info balloon text */ + WCHAR info_title[64]; /* info balloon title */ + UINT info_flags; /* flags for info balloon */ + UINT info_timeout; /* timeout for info balloon */ + HICON info_icon; /* info balloon icon */ }; static struct list icon_list = LIST_INIT( icon_list ); @@ -84,6 +90,9 @@ static int icon_cx, icon_cy, tray_width; #define MIN_DISPLAYED 8 #define ICON_BORDER 2 +#define BALLOON_SHOW_MIN_TIMEOUT 10000 +#define BALLOON_SHOW_MAX_TIMEOUT 30000 + /* Retrieves icon record by owner window and ID */ static struct icon *get_icon(HWND owner, UINT id) { @@ -252,10 +261,9 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) return FALSE; } - if ((nid->uFlags & NIF_STATE) && (nid->dwStateMask & NIS_HIDDEN)) + if (nid->uFlags & NIF_STATE) { - if (nid->dwState & NIS_HIDDEN) hide_icon( icon ); - else show_icon( icon ); + icon->state = (icon->state & ~nid->dwStateMask) | (nid->dwState & nid->dwStateMask); } if (nid->uFlags & NIF_ICON) @@ -276,8 +284,14 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - WINE_FIXME("balloon tip title %s, message %s\n", wine_dbgstr_w(nid->szInfoTitle), wine_dbgstr_w(nid->szInfo)); + lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) ); + lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) ); + icon->info_flags = nid->dwInfoFlags; + icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); + icon->info_icon = nid->hBalloonIcon; } + if (icon->state & NIS_HIDDEN) hide_icon( icon ); + else show_icon( icon ); return TRUE; } @@ -308,10 +322,7 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) if (list_empty( &icon_list )) SetTimer( tray_window, 1, 2000, NULL ); list_add_tail(&icon_list, &icon->entry); - modify_icon( icon, nid ); - /* show icon, unless hidden state was explicitly specified */ - if (!((nid->uFlags & NIF_STATE) && (nid->dwStateMask & NIS_HIDDEN))) show_icon( icon ); - return TRUE; + return modify_icon( icon, nid ); } /* Deletes tray icon window and icon record */

1 0

Alexandre Julliard : explorer: Add support for displaying system tray notification balloons in desktop mode .
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: ed3ac5f4d61d30291078b1cdba392d204ea44426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3ac5f4d61d30291078b1cdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 17:16:52 2010 +0100 explorer: Add support for displaying system tray notification balloons in desktop mode. --- programs/explorer/systray.c | 132 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 122 insertions(+), 10 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 1b55664..93793ab 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -87,9 +87,18 @@ static struct icon **displayed; /* array of currently displayed icons */ static BOOL hide_systray; static int icon_cx, icon_cy, tray_width; +static struct icon *balloon_icon; +static HWND balloon_window; + #define MIN_DISPLAYED 8 #define ICON_BORDER 2 +#define VALID_WIN_TIMER 1 +#define BALLOON_CREATE_TIMER 2 +#define BALLOON_SHOW_TIMER 3 + +#define VALID_WIN_TIMEOUT 2000 +#define BALLOON_CREATE_TIMEOUT 2000 #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 @@ -116,14 +125,11 @@ static RECT get_icon_rect( struct icon *icon ) return rect; } -/* Creates tooltip window for icon. */ -static void create_tooltip(struct icon *icon) +static void init_common_controls(void) { - TTTOOLINFOW ti; - static BOOL tooltips_initialized = FALSE; + static BOOL initialized = FALSE; - /* Register tooltip classes if this is the first icon */ - if (!tooltips_initialized) + if (!initialized) { INITCOMMONCONTROLSEX init_tooltip; @@ -131,9 +137,16 @@ static void create_tooltip(struct icon *icon) init_tooltip.dwICC = ICC_TAB_CLASSES; InitCommonControlsEx(&init_tooltip); - tooltips_initialized = TRUE; + initialized = TRUE; } +} +/* Creates tooltip window for icon. */ +static void create_tooltip(struct icon *icon) +{ + TTTOOLINFOW ti; + + init_common_controls(); icon->tooltip = CreateWindowExW(WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, WS_POPUP | TTS_ALWAYSTIP, CW_USEDEFAULT, CW_USEDEFAULT, @@ -148,6 +161,96 @@ static void create_tooltip(struct icon *icon) SendMessageW(icon->tooltip, TTM_ADDTOOLW, 0, (LPARAM)&ti); } +static void set_balloon_position( struct icon *icon ) +{ + RECT rect = get_icon_rect( icon ); + POINT pos; + + MapWindowPoints( tray_window, 0, (POINT *)&rect, 2 ); + pos.x = (rect.left + rect.right) / 2; + pos.y = (rect.top + rect.bottom) / 2; + SendMessageW( balloon_window, TTM_TRACKPOSITION, 0, MAKELONG( pos.x, pos.y )); +} + +static void balloon_create_timer(void) +{ + TTTOOLINFOW ti; + + init_common_controls(); + balloon_window = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP | TTS_NOPREFIX | TTS_BALLOON | TTS_CLOSE, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + tray_window, NULL, NULL, NULL); + + memset( &ti, 0, sizeof(ti) ); + ti.cbSize = sizeof(TTTOOLINFOW); + ti.hwnd = tray_window; + ti.uFlags = TTF_TRACK; + ti.lpszText = balloon_icon->info_text; + SendMessageW( balloon_window, TTM_ADDTOOLW, 0, (LPARAM)&ti ); + if ((balloon_icon->info_flags & NIIF_ICONMASK) == NIIF_USER) + SendMessageW( balloon_window, TTM_SETTITLEW, (WPARAM)balloon_icon->info_icon, + (LPARAM)balloon_icon->info_title ); + else + SendMessageW( balloon_window, TTM_SETTITLEW, balloon_icon->info_flags, + (LPARAM)balloon_icon->info_title ); + set_balloon_position( balloon_icon ); + SendMessageW( balloon_window, TTM_TRACKACTIVATE, TRUE, (LPARAM)&ti ); + KillTimer( tray_window, BALLOON_CREATE_TIMER ); + SetTimer( tray_window, BALLOON_SHOW_TIMER, balloon_icon->info_timeout, NULL ); +} + +static BOOL show_balloon( struct icon *icon ) +{ + if (icon->display == -1) return FALSE; /* not displayed */ + if (!icon->info_text[0]) return FALSE; /* no balloon */ + balloon_icon = icon; + SetTimer( tray_window, BALLOON_CREATE_TIMER, BALLOON_CREATE_TIMEOUT, NULL ); + return TRUE; +} + +static void hide_balloon(void) +{ + if (!balloon_icon) return; + if (balloon_window) + { + KillTimer( tray_window, BALLOON_SHOW_TIMER ); + DestroyWindow( balloon_window ); + balloon_window = 0; + } + else KillTimer( tray_window, BALLOON_CREATE_TIMER ); + balloon_icon = NULL; +} + +static void show_next_balloon(void) +{ + struct icon *icon; + + LIST_FOR_EACH_ENTRY( icon, &icon_list, struct icon, entry ) + if (show_balloon( icon )) break; +} + +static void update_balloon( struct icon *icon ) +{ + if (balloon_icon == icon) + { + hide_balloon(); + show_balloon( icon ); + } + else if (!balloon_icon) + { + if (!show_balloon( icon )) return; + } + if (!balloon_icon) show_next_balloon(); +} + +static void balloon_timer(void) +{ + if (balloon_icon) balloon_icon->info_text[0] = 0; /* clear text now that balloon has been shown */ + hide_balloon(); + show_next_balloon(); +} + /* Synchronize tooltip text with tooltip window */ static void update_tooltip_text(struct icon *icon) { @@ -171,6 +274,7 @@ static void update_tooltip_position( struct icon *icon ) ti.hwnd = tray_window; if (icon->display != -1) ti.rect = get_icon_rect( icon ); SendMessageW( icon->tooltip, TTM_NEWTOOLRECTW, 0, (LPARAM)&ti ); + if (balloon_icon == icon) set_balloon_position( icon ); } /* find the icon located at a certain point in the tray window */ @@ -220,6 +324,7 @@ static BOOL show_icon(struct icon *icon) if (nb_displayed == 1 && !hide_systray) ShowWindow( tray_window, SW_SHOWNA ); create_tooltip(icon); + update_balloon( icon ); return TRUE; } @@ -245,6 +350,7 @@ static BOOL hide_icon(struct icon *icon) if (!nb_displayed) ShowWindow( tray_window, SW_HIDE ); + update_balloon( icon ); update_tooltip_position( icon ); return TRUE; } @@ -289,6 +395,7 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) icon->info_flags = nid->dwInfoFlags; icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; + update_balloon( icon ); } if (icon->state & NIS_HIDDEN) hide_icon( icon ); else show_icon( icon ); @@ -319,7 +426,7 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) icon->owner = nid->hWnd; icon->display = -1; - if (list_empty( &icon_list )) SetTimer( tray_window, 1, 2000, NULL ); + 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 ); @@ -332,7 +439,7 @@ 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, 1 ); + if (list_empty( &icon_list )) KillTimer( tray_window, VALID_WIN_TIMER ); return TRUE; } @@ -448,7 +555,12 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l break; case WM_TIMER: - cleanup_destroyed_windows(); + 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; + } break; case WM_PAINT:

1 0

Hwang YunSong : browseui: Update Korean resource.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 28a08aba0cfb08c8329fc92060fe60ddda147164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a08aba0cfb08c8329fc9206… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Dec 15 17:09:29 2010 +0900 browseui: Update Korean resource. --- dlls/browseui/rsrc_Ko.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/rsrc_Ko.rc b/dlls/browseui/rsrc_Ko.rc index c6d4a68..ff427c0 100644 --- a/dlls/browseui/rsrc_Ko.rc +++ b/dlls/browseui/rsrc_Ko.rc @@ -19,11 +19,13 @@ #include "resids.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_CANCELLING "��ϴ� ��.." + IDS_CANCELLING "취소하는 중.." } IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 @@ -35,6 +37,6 @@ FONT 9, "MS Shell Dlg" LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 - PUSHBUTTON "��(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "취소(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX }

1 0

Alexandre Julliard : winex11: Store information needed for the info balloon in the tray icon structure.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: ab60be7b11b536f5f7808756c28613ec48be3898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab60be7b11b536f5f7808756c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 16:06:05 2010 +0100 winex11: Store information needed for the info balloon in the tray icon structure. --- dlls/winex11.drv/systray.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index d5adcb9..e069e16 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -32,6 +32,7 @@ #include <X11/Xlib.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -53,11 +54,16 @@ struct tray_icon HWND owner; /* the HWND passed in to the Shell_NotifyIcon call */ HWND window; /* the adaptor window */ HWND tooltip; /* Icon tooltip */ + UINT state; /* state flags */ UINT id; /* the unique id given by the app */ UINT callback_message; int display; /* display index, or -1 if hidden */ - WCHAR tiptext[256]; /* Tooltip text. If empty => tooltip disabled */ - WCHAR tiptitle[64]; /* Tooltip title for ballon style tooltips. If empty => tooltip is not balloon style. */ + WCHAR tiptext[128]; /* tooltip text */ + WCHAR info_text[256]; /* info balloon text */ + WCHAR info_title[64]; /* info balloon title */ + UINT info_flags; /* flags for info balloon */ + UINT info_timeout; /* timeout for info balloon */ + HICON info_icon; /* info balloon icon */ }; static struct list icon_list = LIST_INIT( icon_list ); @@ -78,6 +84,9 @@ Atom systray_atom = 0; #define MIN_DISPLAYED 8 #define ICON_BORDER 2 +#define BALLOON_SHOW_MIN_TIMEOUT 10000 +#define BALLOON_SHOW_MAX_TIMEOUT 30000 + /* stand-alone tray window */ static HWND standalone_tray; static int icon_cx, icon_cy; @@ -108,7 +117,7 @@ static void create_tooltip(struct tray_icon *icon) InitCommonControlsEx(&init_tooltip); tooltips_initialized = TRUE; } - if (icon->tiptitle[0] != 0) + if (icon->info_title[0] != 0) { icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON, @@ -484,10 +493,9 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) { TRACE( "id=0x%x hwnd=%p flags=%x\n", nid->uID, nid->hWnd, nid->uFlags ); - if ((nid->uFlags & NIF_STATE) && (nid->dwStateMask & NIS_HIDDEN)) + if (nid->uFlags & NIF_STATE) { - if (nid->dwState & NIS_HIDDEN) hide_icon( icon ); - else show_icon( icon ); + icon->state = (icon->state & ~nid->dwStateMask) | (nid->dwState & nid->dwStateMask); } if (nid->uFlags & NIF_ICON) @@ -512,15 +520,18 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) if (nid->uFlags & NIF_TIP) { lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); - icon->tiptitle[0] = 0; if (icon->tooltip) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - lstrcpynW(icon->tiptext, nid->szInfo, sizeof(icon->tiptext)/sizeof(WCHAR)); - lstrcpynW(icon->tiptitle, nid->szInfoTitle, sizeof(icon->tiptitle)/sizeof(WCHAR)); - if (icon->tooltip) update_tooltip_text(icon); + lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) ); + lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) ); + icon->info_flags = nid->dwInfoFlags; + icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); + icon->info_icon = nid->hBalloonIcon; } + if (icon->state & NIS_HIDDEN) hide_icon( icon ); + else show_icon( icon ); return TRUE; } @@ -550,10 +561,6 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) list_add_tail(&icon_list, &icon->entry); - /* if hidden state is specified, modify_icon will take care of it */ - if (!((nid->uFlags & NIF_STATE) && (nid->dwStateMask & NIS_HIDDEN))) - show_icon( icon ); - return modify_icon( icon, nid ); }

1 0

Alexandre Julliard : winex11: Add support for displaying system tray notification balloons.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: ace20fae86756ec4059c74d1f6d45e3478786f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace20fae86756ec4059c74d1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 16:24:15 2010 +0100 winex11: Add support for displaying system tray notification balloons. --- dlls/winex11.drv/systray.c | 167 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 144 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index e069e16..20f6d35 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -84,9 +84,19 @@ 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 VALID_WIN_TIMEOUT 2000 +#define BALLOON_CREATE_TIMEOUT 2000 #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 +static struct tray_icon *balloon_icon; +static HWND balloon_window; +static POINT balloon_pos; + /* stand-alone tray window */ static HWND standalone_tray; static int icon_cx, icon_cy; @@ -102,12 +112,11 @@ static struct tray_icon *get_icon(HWND owner, UINT id) return NULL; } -/* create tooltip window for icon */ -static void create_tooltip(struct tray_icon *icon) +static void init_common_controls(void) { - static BOOL tooltips_initialized = FALSE; + static BOOL initialized = FALSE; - if (!tooltips_initialized) + if (!initialized) { INITCOMMONCONTROLSEX init_tooltip; @@ -115,24 +124,19 @@ static void create_tooltip(struct tray_icon *icon) init_tooltip.dwICC = ICC_TAB_CLASSES; InitCommonControlsEx(&init_tooltip); - tooltips_initialized = TRUE; - } - if (icon->info_title[0] != 0) - { - icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, - WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - icon->window, NULL, NULL, NULL); - } - else - { - icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, - WS_POPUP | TTS_ALWAYSTIP, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - icon->window, NULL, NULL, NULL); + initialized = TRUE; } +} + +/* create tooltip window for icon */ +static void create_tooltip(struct tray_icon *icon) +{ + init_common_controls(); + icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); if (icon->tooltip) { TTTOOLINFOW ti; @@ -146,6 +150,101 @@ static void create_tooltip(struct tray_icon *icon) } } +static void update_balloon_position(void) +{ + RECT rect; + POINT pos; + + if (!balloon_icon) return; + GetWindowRect( balloon_icon->window, &rect ); + pos.x = (rect.left + rect.right) / 2; + pos.y = (rect.top + rect.bottom) / 2; + if (pos.x == balloon_pos.x && pos.y == balloon_pos.y) return; /* nothing changed */ + balloon_pos = pos; + SendMessageW( balloon_window, TTM_TRACKPOSITION, 0, MAKELONG( pos.x, pos.y )); +} + +static void balloon_create_timer( struct tray_icon *icon ) +{ + TTTOOLINFOW ti; + + init_common_controls(); + balloon_window = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP | TTS_NOPREFIX | TTS_BALLOON | TTS_CLOSE, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); + + memset( &ti, 0, sizeof(ti) ); + ti.cbSize = sizeof(TTTOOLINFOW); + ti.hwnd = icon->window; + ti.uId = (UINT_PTR)icon->window; + ti.uFlags = TTF_TRACK | TTF_IDISHWND; + ti.lpszText = icon->info_text; + SendMessageW( balloon_window, TTM_ADDTOOLW, 0, (LPARAM)&ti ); + if ((icon->info_flags & NIIF_ICONMASK) == NIIF_USER) + SendMessageW( balloon_window, TTM_SETTITLEW, (WPARAM)icon->info_icon, (LPARAM)icon->info_title ); + else + SendMessageW( balloon_window, TTM_SETTITLEW, icon->info_flags, (LPARAM)icon->info_title ); + balloon_icon = icon; + balloon_pos.x = balloon_pos.y = MAXLONG; + update_balloon_position(); + SendMessageW( balloon_window, TTM_TRACKACTIVATE, TRUE, (LPARAM)&ti ); + KillTimer( icon->window, BALLOON_CREATE_TIMER ); + SetTimer( icon->window, BALLOON_SHOW_TIMER, icon->info_timeout, NULL ); +} + +static BOOL show_balloon( struct tray_icon *icon ) +{ + if (standalone_tray && !show_systray) return FALSE; /* no systray window */ + if (!icon->window) return FALSE; /* not displayed */ + if (!icon->info_text[0]) return FALSE; /* no balloon */ + balloon_icon = icon; + SetTimer( icon->window, BALLOON_CREATE_TIMER, BALLOON_CREATE_TIMEOUT, NULL ); + return TRUE; +} + +static void hide_balloon(void) +{ + if (!balloon_icon) return; + if (balloon_window) + { + KillTimer( balloon_icon->window, BALLOON_SHOW_TIMER ); + DestroyWindow( balloon_window ); + balloon_window = 0; + } + else KillTimer( balloon_icon->window, BALLOON_CREATE_TIMER ); + balloon_icon = NULL; +} + +static void show_next_balloon(void) +{ + struct tray_icon *icon; + + LIST_FOR_EACH_ENTRY( icon, &icon_list, struct tray_icon, entry ) + if (show_balloon( icon )) break; +} + +static void update_balloon( struct tray_icon *icon ) +{ + if (balloon_icon == icon) + { + hide_balloon(); + show_balloon( icon ); + } + else if (!balloon_icon) + { + if (!show_balloon( icon )) return; + } + if (!balloon_icon) show_next_balloon(); +} + +static void balloon_timer(void) +{ + if (balloon_icon) balloon_icon->info_text[0] = 0; /* clear text now that balloon has been shown */ + hide_balloon(); + show_next_balloon(); +} + /* synchronize tooltip text with tooltip window */ static void update_tooltip_text(struct tray_icon *icon) { @@ -192,8 +291,12 @@ static LRESULT WINAPI standalone_tray_wndproc( HWND hwnd, UINT msg, WPARAM wpara { switch (msg) { + case WM_MOVE: + update_balloon_position(); + break; case WM_CLOSE: ShowWindow( hwnd, SW_HIDE ); + hide_balloon(); show_systray = FALSE; return 0; case WM_DESTROY: @@ -275,7 +378,7 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR switch (msg) { case WM_CREATE: - SetTimer( hwnd, 1, 1000, NULL ); + SetTimer( hwnd, VALID_WIN_TIMER, VALID_WIN_TIMEOUT, NULL ); break; case WM_PAINT: @@ -315,8 +418,23 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR } return 0; + case WM_WINDOWPOSCHANGED: + update_balloon_position(); + break; + case WM_TIMER: - if (!IsWindow( icon->owner )) delete_icon( icon ); + switch (wparam) + { + case VALID_WIN_TIMER: + if (!IsWindow( icon->owner )) delete_icon( icon ); + break; + case BALLOON_CREATE_TIMER: + balloon_create_timer( icon ); + break; + case BALLOON_SHOW_TIMER: + balloon_timer(); + break; + } return 0; case WM_CLOSE: @@ -467,6 +585,7 @@ static BOOL hide_icon( struct tray_icon *icon ) icon->window = 0; icon->tooltip = 0; remove_from_standalone_tray( icon ); + update_balloon( icon ); return TRUE; } @@ -485,6 +604,7 @@ static BOOL show_icon( struct tray_icon *icon ) else add_to_standalone_tray( icon ); + update_balloon( icon ); return TRUE; } @@ -529,6 +649,7 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) icon->info_flags = nid->dwInfoFlags; icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; + update_balloon( icon ); } if (icon->state & NIS_HIDDEN) hide_icon( icon ); else show_icon( icon );

1 0

Michael Stefaniuc : msi: Use an iface instead of a vtbl pointer in msi_remote_database_impl.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 24ad5cb68f1813af9254d2fd72fb59c074cda358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ad5cb68f1813af9254d2fd7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 15 10:55:20 2010 +0100 msi: Use an iface instead of a vtbl pointer in msi_remote_database_impl. --- dlls/msi/database.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 886a955..598d7a8 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -2038,14 +2038,14 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) } typedef struct _msi_remote_database_impl { - const IWineMsiRemoteDatabaseVtbl *lpVtbl; + IWineMsiRemoteDatabase IWineMsiRemoteDatabase_iface; MSIHANDLE database; LONG refs; } msi_remote_database_impl; -static inline msi_remote_database_impl* mrd_from_IWineMsiRemoteDatabase( IWineMsiRemoteDatabase* iface ) +static inline msi_remote_database_impl *impl_from_IWineMsiRemoteDatabase( IWineMsiRemoteDatabase *iface ) { - return (msi_remote_database_impl *)iface; + return CONTAINING_RECORD(iface, msi_remote_database_impl, IWineMsiRemoteDatabase_iface); } static HRESULT WINAPI mrd_QueryInterface( IWineMsiRemoteDatabase *iface, @@ -2064,14 +2064,14 @@ static HRESULT WINAPI mrd_QueryInterface( IWineMsiRemoteDatabase *iface, static ULONG WINAPI mrd_AddRef( IWineMsiRemoteDatabase *iface ) { - msi_remote_database_impl* This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl* This = impl_from_IWineMsiRemoteDatabase( iface ); return InterlockedIncrement( &This->refs ); } static ULONG WINAPI mrd_Release( IWineMsiRemoteDatabase *iface ) { - msi_remote_database_impl* This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl* This = impl_from_IWineMsiRemoteDatabase( iface ); ULONG r; r = InterlockedDecrement( &This->refs ); @@ -2086,7 +2086,7 @@ static ULONG WINAPI mrd_Release( IWineMsiRemoteDatabase *iface ) static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface, LPCWSTR table, MSICONDITION *persistent ) { - msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl *This = impl_from_IWineMsiRemoteDatabase( iface ); *persistent = MsiDatabaseIsTablePersistentW(This->database, table); return S_OK; } @@ -2094,7 +2094,7 @@ static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface, static HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface, LPCWSTR table, MSIHANDLE *keys ) { - msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl *This = impl_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiDatabaseGetPrimaryKeysW(This->database, table, keys); return HRESULT_FROM_WIN32(r); } @@ -2102,7 +2102,7 @@ static HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface, static HRESULT WINAPI mrd_GetSummaryInformation( IWineMsiRemoteDatabase *iface, UINT updatecount, MSIHANDLE *suminfo ) { - msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl *This = impl_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiGetSummaryInformationW(This->database, NULL, updatecount, suminfo); return HRESULT_FROM_WIN32(r); } @@ -2110,14 +2110,14 @@ static HRESULT WINAPI mrd_GetSummaryInformation( IWineMsiRemoteDatabase *iface, static HRESULT WINAPI mrd_OpenView( IWineMsiRemoteDatabase *iface, LPCWSTR query, MSIHANDLE *view ) { - msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl *This = impl_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiDatabaseOpenViewW(This->database, query, view); return HRESULT_FROM_WIN32(r); } static HRESULT WINAPI mrd_SetMsiHandle( IWineMsiRemoteDatabase *iface, MSIHANDLE handle ) { - msi_remote_database_impl* This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl* This = impl_from_IWineMsiRemoteDatabase( iface ); This->database = handle; return S_OK; } @@ -2142,7 +2142,7 @@ HRESULT create_msi_remote_database( IUnknown *pOuter, LPVOID *ppObj ) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &msi_remote_database_vtbl; + This->IWineMsiRemoteDatabase_iface.lpVtbl = &msi_remote_database_vtbl; This->database = 0; This->refs = 1;

1 0

Michael Stefaniuc : ole32: Use ifaces instead of vtbl pointers in FTMarshalImpl.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: ee56fbb947e3158ea7334335e363f45803e83f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee56fbb947e3158ea7334335e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 15 00:35:52 2010 +0100 ole32: Use ifaces instead of vtbl pointers in FTMarshalImpl. --- dlls/ole32/ftmarshal.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index d8f4bf6..9e58444 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -39,19 +39,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef struct _FTMarshalImpl { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; LONG ref; - const IMarshalVtbl *lpvtblFTM; + IMarshal IMarshal_iface; IUnknown *pUnkOuter; } FTMarshalImpl; -#define _IFTMUnknown_(This) ((IUnknown*)&(This)->lpVtbl) -#define _IFTMarshal_(This) (&(This)->lpvtblFTM) +static inline FTMarshalImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, FTMarshalImpl, IUnknown_iface); +} static inline FTMarshalImpl *impl_from_IMarshal( IMarshal *iface ) { - return (FTMarshalImpl *)((char*)iface - FIELD_OFFSET(FTMarshalImpl, lpvtblFTM)); + return CONTAINING_RECORD(iface, FTMarshalImpl, IMarshal_iface); } /* inner IUnknown to handle aggregation */ @@ -59,15 +61,15 @@ static HRESULT WINAPI IiFTMUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppv) { - FTMarshalImpl *This = (FTMarshalImpl *)iface; + FTMarshalImpl *This = impl_from_IUnknown(iface); TRACE ("\n"); *ppv = NULL; if (IsEqualIID (&IID_IUnknown, riid)) - *ppv = _IFTMUnknown_ (This); + *ppv = &This->IUnknown_iface; else if (IsEqualIID (&IID_IMarshal, riid)) - *ppv = _IFTMarshal_ (This); + *ppv = &This->IMarshal_iface; else { FIXME ("No interface for %s.\n", debugstr_guid (riid)); return E_NOINTERFACE; @@ -79,7 +81,7 @@ IiFTMUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppv) static ULONG WINAPI IiFTMUnknown_fnAddRef (IUnknown * iface) { - FTMarshalImpl *This = (FTMarshalImpl *)iface; + FTMarshalImpl *This = impl_from_IUnknown(iface); TRACE ("\n"); return InterlockedIncrement (&This->ref); @@ -88,7 +90,7 @@ static ULONG WINAPI IiFTMUnknown_fnAddRef (IUnknown * iface) static ULONG WINAPI IiFTMUnknown_fnRelease (IUnknown * iface) { - FTMarshalImpl *This = (FTMarshalImpl *)iface; + FTMarshalImpl *This = impl_from_IUnknown(iface); TRACE ("\n"); if (InterlockedDecrement (&This->ref)) @@ -340,12 +342,12 @@ HRESULT WINAPI CoCreateFreeThreadedMarshaler (LPUNKNOWN punkOuter, LPUNKNOWN * p if (!ftm) return E_OUTOFMEMORY; - ftm->lpVtbl = &iunkvt; - ftm->lpvtblFTM = &ftmvtbl; + ftm->IUnknown_iface.lpVtbl = &iunkvt; + ftm->IMarshal_iface.lpVtbl = &ftmvtbl; ftm->ref = 1; - ftm->pUnkOuter = punkOuter ? punkOuter : _IFTMUnknown_(ftm); + ftm->pUnkOuter = punkOuter ? punkOuter : &ftm->IUnknown_iface; - *ppunkMarshal = _IFTMUnknown_ (ftm); + *ppunkMarshal = &ftm->IUnknown_iface; return S_OK; }

1 0

Michael Stefaniuc : ole32: Standardize the COM usage in moniker.c.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: bfdcc3930c48492d411759c843c5b398b4cd04ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdcc3930c48492d411759c84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 15 00:58:12 2010 +0100 ole32: Standardize the COM usage in moniker.c. --- dlls/ole32/moniker.c | 87 +++++++++++++++++++++++++++++-------------------- 1 files changed, 51 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfdcc3930c48492d41175…

1 0

Cheer Xiao : view: Update simplified Chinese translation.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: cd944ee94bcb46bd930e98829f7517b5cb1b17a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd944ee94bcb46bd930e98829… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Dec 15 16:55:43 2010 +0800 view: Update simplified Chinese translation. --- programs/view/Zh.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/view/Zh.rc b/programs/view/Zh.rc index 55a2c92..74fb9ae 100644 --- a/programs/view/Zh.rc +++ b/programs/view/Zh.rc @@ -39,7 +39,7 @@ BEGIN MENUITEM "打开(&O)", IDM_OPEN MENUITEM "退出(&x)", IDM_EXIT END - POPUP "平移(&P)" + POPUP "平移(&P)" /* 译名待求证 */ BEGIN MENUITEM "缩放至窗口(&S)", IDM_SET_EXT_TO_WIN MENUITEM SEPARATOR

1 0

Cheer Xiao : write: Update simplified Chinese translation.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: d6f5888b7852a0d261fb1bb2902576fce3acafd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f5888b7852a0d261fb1bb29… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Dec 15 16:57:49 2010 +0800 write: Update simplified Chinese translation. --- programs/write/Makefile.in | 3 ++- programs/write/Zh.rc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index 3ae4651..2c27771 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ Si.rc \ Sr.rc \ Sv.rc \ - Uk.rc + Uk.rc \ + Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/write/Zh.rc b/programs/write/Zh.rc new file mode 100644 index 0000000..1ff92b3 --- /dev/null +++ b/programs/write/Zh.rc @@ -0,0 +1,31 @@ +/* + * Simplified Chinese language support + * + * Copyright (C) 2010 Cheer Xiao <xiaqqaix.at.gmail.com> + * + * 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 + */ + +#include "resources.h" + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +{ + IDS_FAILED, "启动写字板失败" +}

1 0