October 2008 - Wine-commits

Muneyuki Noguchi : cmdlgtst: Convert Japanese resource to UTF-8.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: aac846d11cdf4a97188b52e391a3dd07642843a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac846d11cdf4a97188b52e39… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Oct 11 23:12:54 2008 +0900 cmdlgtst: Convert Japanese resource to UTF-8. --- programs/cmdlgtst/Ja.rc | 121 ++++++++++++++++++++++++---------------------- 1 files changed, 63 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aac846d11cdf4a97188b5…

1 0

Muneyuki Noguchi : notepad: Convert Japanese resource to UTF-8.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 9898c870719c7c88b3ffdf100b7325c7eb5ba815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9898c870719c7c88b3ffdf100… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Oct 11 23:16:18 2008 +0900 notepad: Convert Japanese resource to UTF-8. --- programs/notepad/Ja.rc | 119 +++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 57 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 0a52186..5513932 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -20,46 +20,49 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "�t�@�C��(&F)" { - MENUITEM "�V�K�쐬(&N)\tCtrl+N", CMD_NEW - MENUITEM "�J��(&O)...\tCtrl+O", CMD_OPEN - MENUITEM "�ۑ�(&S)\tCtrl+S", CMD_SAVE - MENUITEM "��O��t��ĕۑ�(&A)...", CMD_SAVE_AS + POPUP "ファイル(&F)" { + MENUITEM "新規作成(&N)\tCtrl+N", CMD_NEW + MENUITEM "開く(&O)...\tCtrl+O", CMD_OPEN + MENUITEM "保存(&S)\tCtrl+S", CMD_SAVE + MENUITEM "名前を付けて保存(&A)...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "��(&P)...\tCtrl+P", CMD_PRINT - MENUITEM "�y�[�W�ݒ�(&T)...", CMD_PAGE_SETUP - MENUITEM "�v��^�̐ݒ�(&R)...", CMD_PRINTER_SETUP + MENUITEM "印刷(&P)...\tCtrl+P", CMD_PRINT + MENUITEM "ページ設定(&T)...", CMD_PAGE_SETUP + MENUITEM "プリンタの設定(&R)...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "�I��(&X)", CMD_EXIT + MENUITEM "終了(&X)", CMD_EXIT } -POPUP "�ҏW(&E)" { - MENUITEM "��ɖ߂�(&U)\tCtrl+Z", CMD_UNDO +POPUP "編集(&E)" { + MENUITEM "元に戻す(&U)\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "�؂��(&T)\tCtrl+X", CMD_CUT - MENUITEM "�R�s�[(&C)\tCtrl+C", CMD_COPY - MENUITEM "�\\��t��(&P)\tCtrl+V", CMD_PASTE - MENUITEM "�폜(&D)\tDel", CMD_DELETE + MENUITEM "切り取り(&T)\tCtrl+X", CMD_CUT + MENUITEM "コピー(&C)\tCtrl+C", CMD_COPY + MENUITEM "貼り付け(&P)\tCtrl+V", CMD_PASTE + MENUITEM "削除(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "��ׂđI��(&A)\tCtrl+A", CMD_SELECT_ALL - MENUITEM "��t�Ǝ��(&T)\tF5", CMD_TIME_DATE + MENUITEM "すべて選択(&A)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "日付と時刻(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "��s��܂�Ԃ�(&W)", CMD_WRAP - MENUITEM "�t�H��g(&F)...", CMD_FONT + MENUITEM "長い行を折り返す(&W)", CMD_WRAP + MENUITEM "フォント(&F)...", CMD_FONT } -POPUP "��(&S)" { - MENUITEM "��(&S)...\tCtrl+F", CMD_SEARCH - MENUITEM "��(&S)\tF3", CMD_SEARCH_NEXT +POPUP "検索(&S)" { + MENUITEM "検索(&S)...\tCtrl+F", CMD_SEARCH + MENUITEM "次を検索(&S)\tF3", CMD_SEARCH_NEXT } -POPUP "�w��v(&H)" { - MENUITEM "�ڎ�(&C)", CMD_HELP_CONTENTS - MENUITEM "��(&S)...", CMD_HELP_SEARCH - MENUITEM "�w��v�̎g��(&H)", CMD_HELP_ON_HELP +POPUP "ヘルプ(&H)" { + MENUITEM "目次(&C)", CMD_HELP_CONTENTS + MENUITEM "検索(&S)...", CMD_HELP_SEARCH + MENUITEM "ヘルプの使い方(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "��ɂ��(&A)", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "メモ帳について(&A)", CMD_HELP_ABOUT_NOTEPAD } } @@ -68,54 +71,56 @@ POPUP " DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "�y�[�W�ݒ�" +CAPTION "ページ設定" { -LTEXT "�w�b�_(&H):", 0x140, 10, 07, 40, 15 +LTEXT "ヘッダ(&H):", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "�t�b�^(&F):", 0x142, 10, 24, 40, 15 +LTEXT "フッタ(&F):", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "�}�[�W��(&M):", 0x144, 10, 43,160, 45 -LTEXT "��(&L):", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "マージン(&M):", 0x144, 10, 43,160, 45 +LTEXT "左(&L):", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "��(&T):", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "上(&T):", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "�E(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "右(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "��(&B):", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "下(&B):", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "�L��Z��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "�w��v(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "キャンセル", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "ヘルプ(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "&p �y�[�W" +STRING_PAGESETUP_FOOTERVALUE, "&p ページ" -STRING_NOTEPAD, "��" -STRING_ERROR, "�G��[" -STRING_WARNING, "�x��" -STRING_INFO, "��" +STRING_NOTEPAD, "メモ帳" +STRING_ERROR, "エラー" +STRING_WARNING, "警告" +STRING_INFO, "情報" -STRING_UNTITLED, "(��)" +STRING_UNTITLED, "(無題)" -STRING_ALL_FILES, "�S�Ẵt�@�C�� (*.*)" -STRING_TEXT_FILES_TXT, "�e�L�X�g�t�@�C�� (*.txt)" +STRING_ALL_FILES, "全てのファイル (*.*)" +STRING_TEXT_FILES_TXT, "テキストファイル (*.txt)" -STRING_TOOLARGE, "�t�@�C�� '%s' �̃T�C�Y�͑傫��邽�߁A��ł͕ҏW�ł��܂��B\n \ -�ʂ̃G�f�B�^��g�p��ĉ��B" -STRING_NOTEXT, "��͂��Ă��܂��B\ -\n��͂��Ă��s��ĉ��B" -STRING_DOESNOTEXIST, "�t�@�C�� '%s'\n�͑��݂��܂��\n\n \ -�V��t�@�C��쐬��܂�� ?" -STRING_NOTSAVED, "�t�@�C�� '%s'\n�͕ύX��Ă��܂�\n\n \ -�ύX��ۑ��܂�� ?" -STRING_NOTFOUND, "'%s' �͌��܂��ł��" -STRING_OUT_OF_MEMORY, "��̑��s��邽�߂̃��\ -��܂��B\n��̋󂫂𑝂₷��߂ɂ��̃A�v��P�[�V��\n�I��\ -��B" +STRING_TOOLARGE, "ファイル '%s' のサイズは大きすぎるため、メモ帳では編集できません。\n \ +別のエディタを使用して下さい。" +STRING_NOTEXT, "何も入力されていません。\ +\n何か入力してから実行して下さい。" +STRING_DOESNOTEXIST, "ファイル '%s'\nは存在しません\n\n \ +新しいファイルを作成しますか ?" +STRING_NOTSAVED, "ファイル '%s'\nは変更されています\n\n \ +変更を保存しますか ?" +STRING_NOTFOUND, "'%s' は見つかりませんでした" +STRING_OUT_OF_MEMORY, "この操作を実行するためのメモリが\ +足りません。\nメモリの空きを増やすためにいくつかのアプリケーションを\n終了して\ +下さい。" } + +#pragma code_page(default)

1 0

Muneyuki Noguchi : cmd: Convert Japanese resource to UTF-8.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: e11c68e19d7a9e828f062ed6636b73b5fd7bd55a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11c68e19d7a9e828f062ed66… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Oct 11 23:08:42 2008 +0900 cmd: Convert Japanese resource to UTF-8. --- programs/cmd/Ja.rc | 279 ++++++++++++++++++++++++++------------------------- 1 files changed, 142 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e11c68e19d7a9e828f062…

1 0

Muneyuki Noguchi : clock: Convert Japanese resource to UTF-8.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: c9c5c0e26bba35cfc367f106483f81bac280f147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c5c0e26bba35cfc367f1064… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Oct 11 23:03:47 2008 +0900 clock: Convert Japanese resource to UTF-8. --- programs/clock/Ja.rc | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/programs/clock/Ja.rc b/programs/clock/Ja.rc index ba3cc0b..b220e79 100644 --- a/programs/clock/Ja.rc +++ b/programs/clock/Ja.rc @@ -19,38 +19,41 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "�v��p�e�B(&P)" { - MENUITEM "�A�i��O(&L)", IDM_ANALOG - MENUITEM "�f�W�^��(&T)", IDM_DIGITAL + POPUP "プロパティ(&P)" { + MENUITEM "アナログ(&L)", IDM_ANALOG + MENUITEM "デジタル(&T)", IDM_DIGITAL MENUITEM SEPARATOR - MENUITEM "�t�H��g(&F)...", IDM_FONT + MENUITEM "フォント(&F)...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "�^�C�g��o�[�Ȃ�(&W)", IDM_NOTITLE + MENUITEM "タイトルバーなし(&W)", IDM_NOTITLE MENUITEM SEPARATOR - MENUITEM "�b(&S)", IDM_SECONDS - MENUITEM "��t(&D)", IDM_DATE + MENUITEM "秒(&S)", IDM_SECONDS + MENUITEM "日付(&D)", IDM_DATE MENUITEM SEPARATOR - MENUITEM "��Ɏ�O�ɕ\\��(&A)", IDM_ONTOP + MENUITEM "常に手前に表示(&A)", IDM_ONTOP } - POPUP "��(&O)" { - MENUITEM "��C�Z��X(&L)...", IDM_LICENSE - MENUITEM "��ۏ�(&N)...", IDM_NOWARRANTY - MENUITEM "��v�ɂ��(&A)...", IDM_ABOUT + POPUP "情報(&O)" { + MENUITEM "ライセンス(&L)...", IDM_LICENSE + MENUITEM "無保証(&N)...", IDM_NOWARRANTY + MENUITEM "時計について(&A)...", IDM_ABOUT } } STRINGTABLE DISCARDABLE { -IDS_CLOCK, "��v" +IDS_CLOCK, "時計" } STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT { -IDS_LICENSE_CAPTION, "��C�Z��X" +IDS_LICENSE_CAPTION, "ライセンス" IDS_LICENSE, "This program is free software; you can redistribute it and/or \ modify it under the terms of the GNU Lesser General Public \ @@ -64,10 +67,12 @@ You should have received a copy of the GNU Lesser General Public \ License along with this program; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" -IDS_WARRANTY_CAPTION, "��ۏ�" +IDS_WARRANTY_CAPTION, "無保証" IDS_WARRANTY, "This program 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." } + +#pragma code_page(default)

1 0

Jacek Caban : mshtml: Added document keydown, keyup, dragstart and selectstart event implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: b21e90ee8a050e367eb77c740ef2e2952236157e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21e90ee8a050e367eb77c740… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:49:25 2008 -0500 mshtml: Added document keydown, keyup, dragstart and selectstart event implementation. --- dlls/mshtml/htmldoc.c | 48 +++++++++++++++++++++++++++++++--------------- dlls/mshtml/htmlevent.c | 10 ++++++++- dlls/mshtml/htmlevent.h | 2 + 3 files changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7637c29..fcabaa1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1011,29 +1011,37 @@ static HRESULT WINAPI HTMLDocument_get_ondblclick(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onkeyup(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_KEYUP, &v); } static HRESULT WINAPI HTMLDocument_get_onkeyup(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_KEYUP, p); } static HRESULT WINAPI HTMLDocument_put_onkeydown(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_KEYDOWN, &v); } static HRESULT WINAPI HTMLDocument_get_onkeydown(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_KEYDOWN, p); } static HRESULT WINAPI HTMLDocument_put_onkeypress(IHTMLDocument2 *iface, VARIANT v) @@ -1183,29 +1191,37 @@ static HRESULT WINAPI HTMLDocument_get_onrowenter(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_ondragstart(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_DRAGSTART, &v); } static HRESULT WINAPI HTMLDocument_get_ondragstart(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_DRAGSTART, p); } static HRESULT WINAPI HTMLDocument_put_onselectstart(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_SELECTSTART, &v); } static HRESULT WINAPI HTMLDocument_get_onselectstart(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_SELECTSTART, p); } static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, long x, long y, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 38b7d5d..c12bc89 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -48,6 +48,9 @@ static const WCHAR onclickW[] = {'o','n','c','l','i','c','k',0}; static const WCHAR dragW[] = {'d','r','a','g',0}; static const WCHAR ondragW[] = {'o','n','d','r','a','g',0}; +static const WCHAR dragstartW[] = {'d','r','a','g','s','t','a','r','t',0}; +static const WCHAR ondragstartW[] = {'o','n','d','r','a','g','s','t','a','r','t',0}; + static const WCHAR focusW[] = {'f','o','c','u','s',0}; static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; @@ -72,6 +75,9 @@ static const WCHAR onmouseupW[] = {'o','n','m','o','u','s','e','u','p',0}; static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR onpasteW[] = {'o','n','p','a','s','t','e',0}; +static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; +static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0}; + typedef struct { LPCWSTR name; LPCWSTR attr_name; @@ -86,6 +92,7 @@ static const event_info_t event_info[] = { {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {dragW, ondragW, 0}, + {dragstartW, ondragstartW, 0}, {focusW, onfocusW, EVENT_DEFAULTLISTENER}, {keydownW, onkeydownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {keyupW, onkeyupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, @@ -93,7 +100,8 @@ static const event_info_t event_info[] = { {mousedownW, onmousedownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseupW, onmouseupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {pasteW, onpasteW, 0} + {pasteW, onpasteW, 0}, + {selectstartW, onselectstartW, 0} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index a5596f4..9b9be58 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -21,6 +21,7 @@ typedef enum { EVENTID_CHANGE, EVENTID_CLICK, EVENTID_DRAG, + EVENTID_DRAGSTART, EVENTID_FOCUS, EVENTID_KEYDOWN, EVENTID_KEYUP, @@ -29,6 +30,7 @@ typedef enum { EVENTID_MOUSEOVER, EVENTID_MOUSEUP, EVENTID_PASTE, + EVENTID_SELECTSTART, EVENTID_LAST } eventid_t;

1 0

Jacek Caban : mshtml: Added element mouseout and selectstart event implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 46434faca3c0163dfa797a59854c70870b3d983d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46434faca3c0163dfa797a598… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:49:33 2008 -0500 mshtml: Added element mouseout and selectstart event implementation. --- dlls/mshtml/htmlelem.c | 30 ++++++++++++++++++++---------- dlls/mshtml/htmlevent.c | 4 ++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1335d14..a8c0786 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -422,8 +422,10 @@ static HRESULT WINAPI HTMLElement_put_onclick(IHTMLElement *iface, VARIANT v) static HRESULT WINAPI HTMLElement_get_onclick(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_CLICK, p); } static HRESULT WINAPI HTMLElement_put_ondblclick(IHTMLElement *iface, VARIANT v) @@ -491,15 +493,19 @@ static HRESULT WINAPI HTMLElement_get_onkeypress(IHTMLElement *iface, VARIANT *p static HRESULT WINAPI HTMLElement_put_onmouseout(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_MOUSEOUT, &v); } static HRESULT WINAPI HTMLElement_get_onmouseout(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_MOUSEOUT, p); } static HRESULT WINAPI HTMLElement_put_onmouseover(IHTMLElement *iface, VARIANT v) @@ -634,15 +640,19 @@ static HRESULT WINAPI HTMLElement_get_language(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_put_onselectstart(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_SELECTSTART, &v); } static HRESULT WINAPI HTMLElement_get_onselectstart(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_SELECTSTART, p); } static HRESULT WINAPI HTMLElement_scrollIntoView(IHTMLElement *iface, VARIANT varargStart) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c12bc89..aaf7541 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -66,6 +66,9 @@ static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; static const WCHAR mousedownW[] = {'m','o','u','s','e','d','o','w','n',0}; static const WCHAR onmousedownW[] = {'o','n','m','o','u','s','e','d','o','w','n',0}; +static const WCHAR mouseoutW[] = {'m','o','u','s','e','o','u','t',0}; +static const WCHAR onmouseoutW[] = {'o','n','m','o','u','s','e','o','u','t',0}; + static const WCHAR mouseoverW[] = {'m','o','u','s','e','o','v','e','r',0}; static const WCHAR onmouseoverW[] = {'o','n','m','o','u','s','e','o','v','e','r',0}; @@ -98,6 +101,7 @@ static const event_info_t event_info[] = { {keyupW, onkeyupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {loadW, onloadW, 0}, {mousedownW, onmousedownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mouseoutW, onmouseoutW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseupW, onmouseupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {pasteW, onpasteW, 0}, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 9b9be58..230450b 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -27,6 +27,7 @@ typedef enum { EVENTID_KEYUP, EVENTID_LOAD, EVENTID_MOUSEDOWN, + EVENTID_MOUSEOUT, EVENTID_MOUSEOVER, EVENTID_MOUSEUP, EVENTID_PASTE,

1 0

Jacek Caban : mshtml: Test for NULL nscontainer in set_event_handler_disp.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: e23d0e077c0c13bbd73658cf09630405e055c614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23d0e077c0c13bbd73658cf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:49:45 2008 -0500 mshtml: Test for NULL nscontainer in set_event_handler_disp. --- dlls/mshtml/htmlevent.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index aaf7541..e7f581a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -531,7 +531,7 @@ static HRESULT set_event_handler_disp(event_target_t **event_target, HTMLDocumen return S_OK; IDispatch_AddRef(disp); - if(event_info[eid].flags & EVENT_DEFAULTLISTENER) { + if(doc->nscontainer && (event_info[eid].flags & EVENT_DEFAULTLISTENER)) { if(!doc->nscontainer->event_vector) { doc->nscontainer->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); if(!doc->nscontainer->event_vector)

1 0

Jacek Caban : mshtml: Added element keydown, mouseup and mousedown event implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 36fa704444210e83d4f7e03bf624c36b6e97a004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fa704444210e83d4f7e03bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:49:16 2008 -0500 mshtml: Added element keydown, mouseup and mousedown event implementation. --- dlls/mshtml/htmlelem.c | 36 ++++++++++++++++++++++++------------ dlls/mshtml/htmlevent.c | 12 ++++++++++++ dlls/mshtml/htmlevent.h | 3 +++ 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b53521a..1335d14 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -443,15 +443,19 @@ static HRESULT WINAPI HTMLElement_get_ondblclick(IHTMLElement *iface, VARIANT *p static HRESULT WINAPI HTMLElement_put_onkeydown(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_KEYDOWN, &v); } static HRESULT WINAPI HTMLElement_get_onkeydown(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_KEYDOWN, p); } static HRESULT WINAPI HTMLElement_put_onkeyup(IHTMLElement *iface, VARIANT v) @@ -533,29 +537,37 @@ static HRESULT WINAPI HTMLElement_get_onmousemove(IHTMLElement *iface, VARIANT * static HRESULT WINAPI HTMLElement_put_onmousedown(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->node, EVENTID_MOUSEDOWN, &v); } static HRESULT WINAPI HTMLElement_get_onmousedown(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_MOUSEDOWN, p); } static HRESULT WINAPI HTMLElement_put_onmouseup(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_MOUSEUP, &v); } static HRESULT WINAPI HTMLElement_get_onmouseup(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_MOUSEUP, p); } static HRESULT WINAPI HTMLElement_get_document(IHTMLElement *iface, IDispatch **p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 67c1d0d..38b7d5d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -51,15 +51,24 @@ static const WCHAR ondragW[] = {'o','n','d','r','a','g',0}; static const WCHAR focusW[] = {'f','o','c','u','s',0}; static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; +static const WCHAR keydownW[] = {'k','e','y','d','o','w','n',0}; +static const WCHAR onkeydownW[] = {'o','n','k','e','y','d','o','w','n',0}; + static const WCHAR keyupW[] = {'k','e','y','u','p',0}; static const WCHAR onkeyupW[] = {'o','n','k','e','y','u','p',0}; static const WCHAR loadW[] = {'l','o','a','d',0}; static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; +static const WCHAR mousedownW[] = {'m','o','u','s','e','d','o','w','n',0}; +static const WCHAR onmousedownW[] = {'o','n','m','o','u','s','e','d','o','w','n',0}; + static const WCHAR mouseoverW[] = {'m','o','u','s','e','o','v','e','r',0}; static const WCHAR onmouseoverW[] = {'o','n','m','o','u','s','e','o','v','e','r',0}; +static const WCHAR mouseupW[] = {'m','o','u','s','e','u','p',0}; +static const WCHAR onmouseupW[] = {'o','n','m','o','u','s','e','u','p',0}; + static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR onpasteW[] = {'o','n','p','a','s','t','e',0}; @@ -78,9 +87,12 @@ static const event_info_t event_info[] = { {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {dragW, ondragW, 0}, {focusW, onfocusW, EVENT_DEFAULTLISTENER}, + {keydownW, onkeydownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {keyupW, onkeyupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {loadW, onloadW, 0}, + {mousedownW, onmousedownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mouseupW, onmouseupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {pasteW, onpasteW, 0} }; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ca5b200..a5596f4 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -22,9 +22,12 @@ typedef enum { EVENTID_CLICK, EVENTID_DRAG, EVENTID_FOCUS, + EVENTID_KEYDOWN, EVENTID_KEYUP, EVENTID_LOAD, + EVENTID_MOUSEDOWN, EVENTID_MOUSEOVER, + EVENTID_MOUSEUP, EVENTID_PASTE, EVENTID_LAST } eventid_t;

1 0

Jacek Caban : mshtml: Added element blur, focus, paste and drag event implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: d6f07e0bf86e0dccdfcb2c5e63fbd3e71c89f9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f07e0bf86e0dccdfcb2c5e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:49:09 2008 -0500 mshtml: Added element blur, focus, paste and drag event implementation. --- dlls/mshtml/htmlelem2.c | 49 +++++++++++++++++++++++++++++++--------------- dlls/mshtml/htmlevent.c | 18 ++++++++++++++++- dlls/mshtml/htmlevent.h | 4 +++ 3 files changed, 54 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 1465086..5e625e6 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -29,6 +29,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -150,15 +151,19 @@ static HRESULT WINAPI HTMLElement2_get_onscroll(IHTMLElement2 *iface, VARIANT *p static HRESULT WINAPI HTMLElement2_put_ondrag(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_DRAG, &v); } static HRESULT WINAPI HTMLElement2_get_ondrag(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_DRAG, p); } static HRESULT WINAPI HTMLElement2_put_ondragend(IHTMLElement2 *iface, VARIANT v) @@ -304,15 +309,19 @@ static HRESULT WINAPI HTMLElement2_get_onbeforepaste(IHTMLElement2 *iface, VARIA static HRESULT WINAPI HTMLElement2_put_onpaste(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_PASTE, &v); } static HRESULT WINAPI HTMLElement2_get_onpaste(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_PASTE, p); } static HRESULT WINAPI HTMLElement2_get_currentStyle(IHTMLElement2 *iface, IHTMLCurrentStyle **p) @@ -468,29 +477,37 @@ static HRESULT WINAPI HTMLElement2_get_accessKey(IHTMLElement2 *iface, BSTR *p) static HRESULT WINAPI HTMLElement2_put_onblur(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_BLUR, &v); } static HRESULT WINAPI HTMLElement2_get_onblur(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_BLUR, p); } static HRESULT WINAPI HTMLElement2_put_onfocus(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_FOCUS, &v); } static HRESULT WINAPI HTMLElement2_get_onfocus(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_FOCUS, p); } static HRESULT WINAPI HTMLElement2_put_onresize(IHTMLElement2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9995544..67c1d0d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -36,12 +36,21 @@ struct event_target_t { IDispatch *event_table[EVENTID_LAST]; }; +static const WCHAR blurW[] = {'b','l','u','r',0}; +static const WCHAR onblurW[] = {'o','n','b','l','u','r',0}; + static const WCHAR changeW[] = {'c','h','a','n','g','e',0}; static const WCHAR onchangeW[] = {'o','n','c','h','a','n','g','e',0}; static const WCHAR clickW[] = {'c','l','i','c','k',0}; static const WCHAR onclickW[] = {'o','n','c','l','i','c','k',0}; +static const WCHAR dragW[] = {'d','r','a','g',0}; +static const WCHAR ondragW[] = {'o','n','d','r','a','g',0}; + +static const WCHAR focusW[] = {'f','o','c','u','s',0}; +static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; + static const WCHAR keyupW[] = {'k','e','y','u','p',0}; static const WCHAR onkeyupW[] = {'o','n','k','e','y','u','p',0}; @@ -51,6 +60,9 @@ static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; static const WCHAR mouseoverW[] = {'m','o','u','s','e','o','v','e','r',0}; static const WCHAR onmouseoverW[] = {'o','n','m','o','u','s','e','o','v','e','r',0}; +static const WCHAR pasteW[] = {'p','a','s','t','e',0}; +static const WCHAR onpasteW[] = {'o','n','p','a','s','t','e',0}; + typedef struct { LPCWSTR name; LPCWSTR attr_name; @@ -61,11 +73,15 @@ typedef struct { #define EVENT_BUBBLE 0x0002 static const event_info_t event_info[] = { + {blurW, onblurW, EVENT_DEFAULTLISTENER}, {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {dragW, ondragW, 0}, + {focusW, onfocusW, EVENT_DEFAULTLISTENER}, {keyupW, onkeyupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {loadW, onloadW, 0}, - {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE} + {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {pasteW, onpasteW, 0} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b5b581b..ca5b200 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -17,11 +17,15 @@ */ typedef enum { + EVENTID_BLUR, EVENTID_CHANGE, EVENTID_CLICK, + EVENTID_DRAG, + EVENTID_FOCUS, EVENTID_KEYUP, EVENTID_LOAD, EVENTID_MOUSEOVER, + EVENTID_PASTE, EVENTID_LAST } eventid_t;

1 0

Jacek Caban : mshtml: Added IHTMLInputElement::select implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: bf61a2619f79c9954e9c6ddff07679b14113dfdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf61a2619f79c9954e9c6ddff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:48:58 2008 -0500 mshtml: Added IHTMLInputElement::select implementation. --- dlls/mshtml/htmlinput.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e53f4c7..fa120d0 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -288,8 +288,17 @@ static HRESULT WINAPI HTMLInputElement_get_maxLength(IHTMLInputElement *iface, l static HRESULT WINAPI HTMLInputElement_select(IHTMLInputElement *iface) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)\n", This); + + nsres = nsIDOMHTMLInputElement_Select(This->nsinput); + if(NS_FAILED(nsres)) { + ERR("Select failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_onchange(IHTMLInputElement *iface, VARIANT v)

1 0