September 2007 - Wine-Commits

Aric Stewart : propsheet: Do not change idea of size when new pages are added.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 7d947c16cb13395dc67efba9f3016ab1af890dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d947c16cb13395dc67efba9f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 13 07:53:45 2007 -0500 propsheet: Do not change idea of size when new pages are added. --- dlls/comctl32/propsheet.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index d5142a8..cc9242d 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -402,7 +402,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, */ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, PropSheetInfo * psInfo, - int index) + int index, BOOL resize) { const DLGTEMPLATE* pTemplate; const WORD* p; @@ -503,11 +503,14 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, } /* remember the largest width and height */ - if (width > psInfo->width) - psInfo->width = width; + if (resize) + { + if (width > psInfo->width) + psInfo->width = width; - if (height > psInfo->height) - psInfo->height = height; + if (height > psInfo->height) + psInfo->height = height; + } /* menu */ switch ((WORD)*p) @@ -2284,7 +2287,7 @@ static BOOL PROPSHEET_AddPage(HWND hwndDlg, return FALSE; psInfo->proppage = ppi; - if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages)) + if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages, FALSE)) return FALSE; psInfo->proppage[psInfo->nPages].hpage = hpage; @@ -2840,7 +2843,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) } if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, - psInfo, n)) + psInfo, n, TRUE)) { if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage); @@ -2883,7 +2886,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) } if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, - psInfo, n)) + psInfo, n, TRUE)) { if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage);

1 0

Lei Zhang : replace generic severity descriptions with wine specific ones ( try 2)
by Jeremy Newman Sept. 13, 2007

Sept. 13, 2007

Module: bugzilla Branch: master Commit: bec592171b632297d6212982e2e5ff0fe51738ce URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=bec592171b632297d6212… Author: Lei Zhang <thestig(a)google.com> Date: Wed Sep 12 15:20:32 2007 -0700 replace generic severity descriptions with wine specific ones (try 2) Hi, This is for bug 9110. I changed some of the severity descriptions based on feedback on wine-devel. >From 05a44e8b333ae3b76427f683c287271c146e7818 Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> Date: Wed, 12 Sep 2007 15:14:57 -0700 Subject: [PATCH] [bugzilla] replace generic severity descriptions with wine specific ones --- template/en/default/pages/fields.html.tmpl | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index 6b77f8b..ac2a0d8 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -217,27 +217,32 @@ This field describes the impact of [% terms.abug %]. <tr> <th>Critical</th> - <td>crashes, loss of data, severe memory leak</td> + <td>Critical problem that prevents all applications from working</td> </tr> <tr> <th>Major</th> - <td>major loss of function</td> + <td>Major loss of functionality for a wide range of applications</td> + </tr> + + <tr> + <th>Normal</th> + + <td>For an application crash or loss of functionality</td> </tr> <tr> <th>Minor</th> - <td>minor loss of function, or other problem where easy + <td>For minor loss of functionality, or other problem where an easy workaround is present</td> </tr> <tr> <th>Trivial</th> - <td>cosmetic problem like misspelled words or misaligned - text</td> + <td>For a UI glitch that doesn't affect running of a program</td> </tr> <tr>

1 0

CVSROOT/. config
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

ChangeSet ID: 31376 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2007/09/13 07:20:21 Modified files: . : config Log message: Comment out PreservePermissions to avoid warnings with new CVS version. Patch: http://cvs.winehq.org/patch.py?id=31376 Old revision New revision Changes Path 1.8 1.9 +1 -1 CVSROOT/config Index: CVSROOT/config diff -u -p CVSROOT/config:1.8 CVSROOT/config:1.9 --- CVSROOT/config:1.8 13 Sep 2007 12:20:21 -0000 +++ CVSROOT/config 13 Sep 2007 12:20:21 -0000 @@ -5,7 +5,7 @@ SystemAuth=no # in the repository. # Note: +x gets preserved anyway, and ``yes'' results in no write perms, # so ``no'' is a better choice -PreservePermissions=no +# PreservePermissions=no # Set `TopLevelAdmin' to `yes' to create a CVS directory at the top # level of the new working directory when using the `cvs checkout'

1 0

Hwang YunSong(황윤성) : mshtml: Updated Korean resource.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: adc09ad52ae86be2ccaab4ce49609e0d61fca3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc09ad52ae86be2ccaab4ce4… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Sep 12 16:19:15 2007 +0900 mshtml: Updated Korean resource. --- dlls/mshtml/Ko.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index 04f0190..a5ec9e5 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2005 Jacek Caban - * Copyright 2005 YunSong Hwang + * Copyright 2005,2006 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,7 +36,7 @@ FONT 8, "MS Shell Dlg" LTEXT "�� ø��̼�� HTML �� ַ�� մϴ�. Wine�� ֱ� ��ظ� " \ "Gecko (Mozilla HTML ��)�� ġ�� Դϴ�. Wine�� ڵ�� Gecko�� ٿ�ε��ϰ� ��ġ�ϱ⸦ ��Ѵٸ� " \ "[��ġ]��ư�� Ŭ��Ͻʽÿ�", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT - CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "��ġ", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "��ġ(&I)", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��(&C)", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP }

1 0

Lei Zhang : user32: Edit control should respond to ctrl + z.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 5079d20ffe2966bced1854c239ba9715005355d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5079d20ffe2966bced1854c23… Author: Lei Zhang <thestig(a)google.com> Date: Tue Sep 11 21:34:10 2007 -0700 user32: Edit control should respond to ctrl + z. --- dlls/user32/edit.c | 4 +++ dlls/user32/tests/edit.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 77ecf32..b11bf10 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4036,6 +4036,10 @@ static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) if (!((es->style & ES_READONLY) || (es->style & ES_PASSWORD))) SendMessageW(es->hwndSelf, WM_CUT, 0, 0); break; + case 0x1A: /* ^Z */ + if (!(es->style & ES_READONLY)) + SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); + break; default: /*If Edit control style is ES_NUMBER allow users to key in only numeric values*/ diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 534bd9b..c74f6d7 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1047,6 +1047,63 @@ static void test_espassword(void) DestroyWindow (hwEdit); } +static void test_undo(void) +{ + HWND hwEdit; + LONG r; + DWORD cpMin, cpMax; + char buffer[1024]; + const char* text = "undo this"; + + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) text); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + /* select all, */ + cpMin = cpMax = 0xdeadbeef; + SendMessage(hwEdit, EM_SETSEL, 0, -1); + r = SendMessage(hwEdit, EM_GETSEL, (WPARAM) &cpMin, (LPARAM) &cpMax); + ok((strlen(text) << 16) == r, "Unexpected length %d\n", r); + ok(0 == cpMin, "Expected: %d, got %d\n", 0, cpMin); + ok(9 == cpMax, "Expected: %d, got %d\n", 9, cpMax); + + /* cut (ctrl-x) */ + r = SendMessage(hwEdit, WM_CHAR, 24, 0); + todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected %s, got %s\n", "", buffer); + + /* undo (ctrl-z) */ + r = SendMessage(hwEdit, WM_CHAR, 26, 0); + todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(strlen(text) == r, "Unexpected length %d\n", r); + ok(0 == strcmp(buffer, text), "expected %s, got %s\n", text, buffer); + + /* undo again (ctrl-z) */ + r = SendMessage(hwEdit, WM_CHAR, 26, 0); + todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == 0, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected %s, got %s\n", "", buffer); + + DestroyWindow (hwEdit); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1113,6 +1170,7 @@ START_TEST(edit) test_margins_font_change(); test_text_position(); test_espassword(); + test_undo(); UnregisterWindowClasses(); }

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement stub implementation.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: bb90785a68bbb03acedd446365169e60c83ef625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb90785a68bbb03acedd44636… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:38:14 2007 +0200 mshtml: Added IHTMLAnchorElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlanchor.c | 485 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelem.c | 5 +- dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 491 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb90785a68bbb03acedd4…

1 0

Americo Jose Melo : Update the Portuguese translation.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: c5ba90131e8c5cebc210bb6a51d2cdecce13ff93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ba90131e8c5cebc210bb6a5… Author: Americo Jose Melo <mmodem00(a)gmail.com> Date: Wed Sep 12 23:37:44 2007 +0200 Update the Portuguese translation. --- dlls/comctl32/comctl_Fr.rc | 2 +- dlls/comctl32/comctl_Pt.rc | 4 +- dlls/comdlg32/cdlg_Pt.rc | 190 +++++++++++++++++++------------- dlls/oleaut32/oleaut32_Pt.rc | 2 +- dlls/shell32/shell32_Pt.rc | 10 +- dlls/shlwapi/shlwapi_Pt.rc | 12 ++- dlls/wineps.drv/wps_Pt.rc | 2 +- dlls/wininet/wininet_Pt.rc | 9 ++- dlls/winmm/winmm_Pt.rc | 84 +++++++------- programs/winecfg/Pt.rc | 28 +++--- programs/wineconsole/wineconsole_Pt.rc | 12 +- programs/winefile/Pt.rc | 27 ++++- programs/winhelp/Pt.rc | 4 +- 13 files changed, 226 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5ba90131e8c5cebc210b…

1 0

Jacek Caban : mshtml: Store HTMLDOMNode struct instead of pointer in HTMLElement object.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: b733e958592e26100fd0449b8bbf56857d71d2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b733e958592e26100fd0449b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:39:17 2007 +0200 mshtml: Store HTMLDOMNode struct instead of pointer in HTMLElement object. --- dlls/mshtml/htmlanchor.c | 4 +- dlls/mshtml/htmlbody.c | 12 +++++----- dlls/mshtml/htmlelem.c | 45 +++++++++++++++++++++----------------- dlls/mshtml/htmlinput.c | 4 +- dlls/mshtml/htmlnode.c | 48 +++++++++++++++++++++++++++-------------- dlls/mshtml/htmlselect.c | 4 +- dlls/mshtml/htmltextarea.c | 4 +- dlls/mshtml/mshtml_private.h | 5 ++- 8 files changed, 73 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b733e958592e26100fd04…

1 0

Roderick Colenbrander : wgl: Fix a major ATI regression.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 2a839e96c928b1aea8c7e03bb053deb66d0f238f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a839e96c928b1aea8c7e03bb… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Sep 13 01:04:30 2007 +0200 wgl: Fix a major ATI regression. ATI's latest drivers (8.41.7) don't advertise visualids anymore for GLXFBConfigs. --- dlls/winex11.drv/opengl.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3dab1b6..156a574 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -814,9 +814,10 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) static BOOL init_formats(Display *display, int screen, Visual *visual) { - int fmt_id, tmp_vis_id, tmp_fmt_id, nCfgs, i; + int fmt_id, tmp_fmt_id, nCfgs, i; GLXFBConfig* cfgs; GLXFBConfig fbconfig = NULL; + XVisualInfo *visinfo; VisualID visualid = XVisualIDFromVisual(visual); int nOffscreenFormats = 0; @@ -833,17 +834,16 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) /* Count the number of offscreen formats to determine the size for our pixelformat list */ for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(display, cfgs[i], GLX_VISUAL_ID, &tmp_vis_id); + pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); - /* We have found Wine's main visual */ - if(tmp_vis_id == visualid) { + visinfo = pglXGetVisualFromFBConfig(display, cfgs[i]); + /* Onscreen formats have a corresponding XVisual, offscreen ones don't */ + if(!visinfo) { + nOffscreenFormats++; + } else if(visinfo && visinfo->visualid == visualid) { pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &fmt_id); fbconfig = cfgs[i]; - } - - /* We have found an offscreen rendering format :) */ - if(tmp_vis_id == 0) { - nOffscreenFormats++; + XFree(visinfo); } } TRACE("Number of offscreen formats: %d\n", nOffscreenFormats); @@ -860,11 +860,11 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) /* Fill the list with offscreen formats */ for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(display, cfgs[i], GLX_VISUAL_ID, &tmp_vis_id); pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); - /* We have found an offscreen rendering format :) */ - if(tmp_vis_id == 0) { + visinfo = pglXGetVisualFromFBConfig(display, cfgs[i]); + /* We have found an offscreen rendering format when there is no visualinfo :) */ + if(!visinfo) { TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize+1, i); WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; @@ -872,6 +872,8 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE; WineGLPixelFormatListSize++; + } else { + XFree(visinfo); } }

1 0

Jacek Caban : mshtml.idl: Added IHTMLAnchorElement.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 1ab3dbd55e2e308afa45a39535a10a6749dc8fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab3dbd55e2e308afa45a3953… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:38:07 2007 +0200 mshtml.idl: Added IHTMLAnchorElement. --- include/mshtmdid.h | 25 ++++++++++ include/mshtml.idl | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 804119a..03d32da 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1682,6 +1682,31 @@ #define DISPID_IHTMLBODYELEMENT2_ONBEFOREPRINT DISPID_EVPROP_ONBEFOREPRINT #define DISPID_IHTMLBODYELEMENT2_ONAFTERPRINT DISPID_EVPROP_ONAFTERPRINT +/* IHTMLAnchorElement */ +#define DISPID_IHTMLANCHORELEMENT_HREF DISPID_VALUE +#define DISPID_IHTMLANCHORELEMENT_TARGET DISPID_ANCHOR+3 +#define DISPID_IHTMLANCHORELEMENT_REL DISPID_ANCHOR+5 +#define DISPID_IHTMLANCHORELEMENT_REV DISPID_ANCHOR+6 +#define DISPID_IHTMLANCHORELEMENT_URN DISPID_ANCHOR+7 +#define DISPID_IHTMLANCHORELEMENT_METHODS DISPID_ANCHOR+8 +#define DISPID_IHTMLANCHORELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLANCHORELEMENT_HOST DISPID_ANCHOR+12 +#define DISPID_IHTMLANCHORELEMENT_HOSTNAME DISPID_ANCHOR+13 +#define DISPID_IHTMLANCHORELEMENT_PATHNAME DISPID_ANCHOR+14 +#define DISPID_IHTMLANCHORELEMENT_PORT DISPID_ANCHOR+15 +#define DISPID_IHTMLANCHORELEMENT_PROTOCOL DISPID_ANCHOR+16 +#define DISPID_IHTMLANCHORELEMENT_SEARCH DISPID_ANCHOR+17 +#define DISPID_IHTMLANCHORELEMENT_HASH DISPID_ANCHOR+18 +#define DISPID_IHTMLANCHORELEMENT_ONBLUR DISPID_EVPROP_ONBLUR +#define DISPID_IHTMLANCHORELEMENT_ONFOCUS DISPID_EVPROP_ONFOCUS +#define DISPID_IHTMLANCHORELEMENT_ACCESSKEY DISPID_SITE+5 +#define DISPID_IHTMLANCHORELEMENT_PROTOCOLLONG DISPID_ANCHOR+31 +#define DISPID_IHTMLANCHORELEMENT_MIMETYPE DISPID_ANCHOR+30 +#define DISPID_IHTMLANCHORELEMENT_NAMEPROP DISPID_ANCHOR+32 +#define DISPID_IHTMLANCHORELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX +#define DISPID_IHTMLANCHORELEMENT_FOCUS DISPID_SITE+0 +#define DISPID_IHTMLANCHORELEMENT_BLUR DISPID_SITE+2 + /* IHTMLTxtRange */ #define DISPID_IHTMLTXTRANGE_HTMLTEXT DISPID_RANGE+3 #define DISPID_IHTMLTXTRANGE_TEXT DISPID_RANGE+4 diff --git a/include/mshtml.idl b/include/mshtml.idl index c6420d6..9e302c0 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -3057,6 +3057,140 @@ interface IHTMLBodyElement2 : IDispatch HRESULT onafterprint([retval, out] VARIANT *p); } +/***************************************************************************** + * IHTMLAnchorElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f1da-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLAnchorElement : IDispatch +{ + [propput, id(DISPID_IHTMLANCHORELEMENT_HREF), displaybind, bindable] + HRESULT href([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_HREF), displaybind, bindable] + HRESULT href([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_TARGET), displaybind, bindable] + HRESULT target([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_TARGET), displaybind, bindable] + HRESULT target([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_REL), displaybind, bindable] + HRESULT rel([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_REL), displaybind, bindable] + HRESULT rel([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_REV), displaybind, bindable] + HRESULT rev([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_REV), displaybind, bindable] + HRESULT rev([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_URN), displaybind, bindable] + HRESULT urn([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_URN), displaybind, bindable] + HRESULT urn([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_METHODS), displaybind, bindable] + HRESULT Methods([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_METHODS), displaybind, bindable] + HRESULT Methods([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_NAME), displaybind, bindable] + HRESULT name([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_HOST)] + HRESULT host([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_HOST)] + HRESULT host([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_HOSTNAME)] + HRESULT hostname([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_HOSTNAME)] + HRESULT hostname([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_PATHNAME)] + HRESULT pathname([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_PATHNAME)] + HRESULT pathname([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_PORT)] + HRESULT port([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_PORT)] + HRESULT port([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_PROTOCOL)] + HRESULT protocol([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_PROTOCOL)] + HRESULT protocol([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_SEARCH)] + HRESULT search([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_SEARCH)] + HRESULT search([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_HASH)] + HRESULT hash([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_HASH)] + HRESULT hash([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_ONBLUR), displaybind, bindable] + HRESULT onblur([in] VARIANT v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_ONBLUR), displaybind, bindable] + HRESULT onblur([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_ONFOCUS), displaybind, bindable] + HRESULT onfocus([in] VARIANT v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_ONFOCUS), displaybind, bindable] + HRESULT onfocus([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_ACCESSKEY), displaybind, bindable] + HRESULT accessKey([in] BSTR v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_ACCESSKEY), displaybind, bindable] + HRESULT accessKey([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLANCHORELEMENT_PROTOCOLLONG)] + HRESULT protocolLong([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLANCHORELEMENT_MIMETYPE)] + HRESULT mimeType([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLANCHORELEMENT_NAMEPROP)] + HRESULT nameProp([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLANCHORELEMENT_TABINDEX), displaybind, bindable] + HRESULT tabIndex([in] short v); + + [propget, id(DISPID_IHTMLANCHORELEMENT_TABINDEX), displaybind, bindable] + HRESULT tabIndex([retval, out] short *p); + + [id(DISPID_IHTMLANCHORELEMENT_FOCUS)] + HRESULT focus(); + + [id(DISPID_IHTMLANCHORELEMENT_BLUR)] + HRESULT blur(); +} /***************************************************************************** * IHTMLElementCollection interface

1 0