wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Francois Gouget : user32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 189ea269892f685494c97b110c0c6b56f1415af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ea269892f685494c97b110… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:02:19 2008 +0200 user32/tests: Add a trailing '\n' to an ok() call. --- dlls/user32/tests/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8d60d21..2a26447 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1194,7 +1194,7 @@ static void test_ToUnicode(void) todo_wine ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); - ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)", ret); + ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)\n", ret); if(ret == 1) ok(wStr[0]=='\n', "ToUnicode for CTRL + Return was %i (expected 10)\n", wStr[0]);

1 0

Francois Gouget : winhttp/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: ffcb02696ccb58cdc9d3c6a760c52ac7186f584c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcb02696ccb58cdc9d3c6a76… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:01:59 2008 +0200 winhttp/tests: Add a trailing '\n' to an ok() call. --- dlls/winhttp/tests/winhttp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1e50f36..3e963ac 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -250,7 +250,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, test_header_name, buffer, &len, &index); - ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded, found 'Warning' header."); + ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded, found 'Warning' header.\n"); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); ok(ret == TRUE, "WinHttpAddRequestHeader failed to add new header, got %d with error %u.\n", ret, GetLastError());

1 0

Francois Gouget : msxml3: Add a '\n' to a Wine trace.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 4560ce24d88ab8d9535d3658e9500ab9c037289e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4560ce24d88ab8d9535d3658e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:01:47 2008 +0200 msxml3: Add a '\n' to a Wine trace. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 61f01f1..062ce7a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1475,7 +1475,7 @@ static HRESULT WINAPI domdoc_save( IXMLDOMDocument_Release(pDocument); } - TRACE("ret %d", ret); + TRACE("ret %d\n", ret); return ret; }

1 0

Francois Gouget : gdiplus: Add some documentation stubs to make winapicheck happy.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 25346b843770383a2929a9adfb4fe7d0dfcfc113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25346b843770383a2929a9adf… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:01:27 2008 +0200 gdiplus: Add some documentation stubs to make winapicheck happy. --- dlls/gdiplus/region.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index f1142b7..689f30b 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -227,6 +227,9 @@ GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone) return clone_element(&region->node, &element); } +/***************************************************************************** + * GdipCombineRegionPath [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, CombineMode mode) { GpRegion *path_region; @@ -270,6 +273,9 @@ out: return stat; } +/***************************************************************************** + * GdipCombineRegionRect [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, GDIPCONST GpRectF *rect, CombineMode mode) { @@ -314,6 +320,9 @@ out: return stat; } +/***************************************************************************** + * GdipCombineRegionRectI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region, GDIPCONST GpRect *rect, CombineMode mode) { @@ -373,6 +382,9 @@ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, return Ok; } +/***************************************************************************** + * GdipCreateRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) { TRACE("%p\n", region); @@ -505,6 +517,9 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) return Ok; } +/***************************************************************************** + * GdipCreateRegionRect [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *rect, GpRegion **region) { @@ -734,6 +749,9 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, return Ok; } +/***************************************************************************** + * GdipGetRegionDataSize [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) { TRACE("%p, %p\n", region, needed); @@ -778,9 +796,12 @@ GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2, GpGra return NotImplemented; } -/* I think graphics is ignored here */ +/***************************************************************************** + * GdipIsInfiniteRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *region, GpGraphics *graphics, BOOL *res) { + /* I think graphics is ignored here */ TRACE("(%p, %p, %p)\n", region, graphics, res); if(!region || !graphics || !res) @@ -791,6 +812,9 @@ GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *region, GpGraphics *graphics, return Ok; } +/***************************************************************************** + * GdipSetEmptye [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) { GpStatus stat;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 4823b2c7bf2e7cf05e02a99d6abe3c54172e9766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4823b2c7bf2e7cf05e02a99d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:01:17 2008 +0200 Assorted spelling fixes. --- dlls/advapi32/tests/service.c | 12 ++++++------ dlls/d3dxof/d3dxof.c | 4 ++-- dlls/mstask/tests/task.c | 6 +++--- dlls/mstask/tests/task_scheduler.c | 2 +- dlls/riched20/table.c | 4 ++-- dlls/shdocvw/tests/intshcut.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/winhttp/tests/winhttp.c | 8 +++++--- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 268827e..da62b0b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1110,7 +1110,7 @@ static void test_enum_svc(void) /* Store the number of returned services */ tempreturned = returned; - /* Allocate less then the needed bytes and don't specify a resume handle */ + /* Allocate less than the needed bytes and don't specify a resume handle */ services = HeapAlloc(GetProcessHeap(), 0, tempneeded - 1); bufsize = tempneeded - 1; needed = 0xdeadbeef; @@ -1128,7 +1128,7 @@ static void test_enum_svc(void) } HeapFree(GetProcessHeap(), 0, services); - /* Allocate less then the needed bytes, this time with a correct resume handle */ + /* Allocate less than the needed bytes, this time with a correct resume handle */ services = HeapAlloc(GetProcessHeap(), 0, tempneeded - 1); bufsize = tempneeded - 1; needed = 0xdeadbeef; @@ -1173,8 +1173,8 @@ static void test_enum_svc(void) /* Vista only shows the drivers with a state of SERVICE_RUNNING as active * and doesn't count the others as inactive. This means that Vista could - * show a total that is greater then the sum of active and inactive drivers. - * + * show a total that is greater than the sum of active and inactive + * drivers. * The number of active and inactive drivers is greatly influenced by the * time when tests are run, immediately after boot or later for example. * @@ -1460,7 +1460,7 @@ static void test_enum_svc(void) /* Store the number of returned services */ tempreturned = returned; - /* Allocate less then the needed bytes and don't specify a resume handle */ + /* Allocate less than the needed bytes and don't specify a resume handle */ exservices = HeapAlloc(GetProcessHeap(), 0, tempneeded - 1); bufsize = tempneeded - 1; needed = 0xdeadbeef; @@ -1478,7 +1478,7 @@ static void test_enum_svc(void) } HeapFree(GetProcessHeap(), 0, exservices); - /* Allocate less then the needed bytes, this time with a correct resume handle */ + /* Allocate less than the needed bytes, this time with a correct resume handle */ exservices = HeapAlloc(GetProcessHeap(), 0, tempneeded - 1); bufsize = tempneeded - 1; needed = 0xdeadbeef; diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index d1f580c..9f19d5f 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -778,7 +778,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) } if (cur_member->idx_template == buf->pdxf->nb_xtemplates) { - TRACE("Reference to non existing template '%s'\n", (char*)buf->value); + TRACE("Reference to a nonexistent template '%s'\n", (char*)buf->value); return FALSE; } if (check_TOKEN(buf) == TOKEN_NAME) @@ -817,7 +817,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) } if (cur_member->idx_template == buf->pdxf->nb_xtemplates) { - TRACE("Reference to non existing template '%s'\n", (char*)buf->value); + TRACE("Reference to nonexistent template '%s'\n", (char*)buf->value); return FALSE; } } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 820b962..7cb7673 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -126,7 +126,7 @@ static void test_SetApplicationName_GetApplicationName(void) CoTaskMemFree(stored_name); } - /* Set application name to a non-existent application and then get + /* Set application name to a nonexistent application and then get * the application name that is actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); ok(hres == S_OK, "Failed setting name %s: %08x\n", @@ -170,8 +170,8 @@ static void test_SetApplicationName_GetApplicationName(void) CoTaskMemFree(stored_name); } - /* After having a valid application name set, set application name - * to a non-existant application and then get the name that is + /* After having a valid application name set, set application the name + * to a nonexistent application and then get the name that is * actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); ok(hres == S_OK, "Failed setting name %s: %08x\n", diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index af3a565..2de0e16 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -93,7 +93,7 @@ static void test_Activate(void) return; } - /* Attempt to Activate a non-existant task */ + /* Attempt to activate a nonexistent task */ hres = ITaskScheduler_Activate(test_task_scheduler, not_task_name, &IID_ITask, (IUnknown**)&task); ok(hres == COR_E_FILENOTFOUND, "Expected COR_E_FILENOTFOUND: %08x\n", hres); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 6289e34..9cb4bbf 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -29,7 +29,7 @@ * Richedit version 1.0 - 3.0: * Tables are implemented in these versions using tabs at the end of cells, * and tab stops to position the cells. The paragraph format flag PFE_TABLE - * will indicate the the paragraph is a table row. Note that in this + * will indicate that the paragraph is a table row. Note that in this * implementation there is one paragraph per table row. * * Richedit version 4.1: @@ -37,7 +37,7 @@ * each with it's own paragraph format, and cells may even contain tables * nested within the cell. * - * There are is also a paragraph at the start of each table row that contains + * There is also a paragraph at the start of each table row that contains * the rows paragraph format (e.g. to change the row alignment to row), and a * paragraph at the end of the table row with the PFE_TABLEROWDELIMITER flag * set. The paragraphs at the start and end of the table row should always be diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index bdd6d2b..0b0798a 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -171,7 +171,7 @@ static void test_NullURLs(void) hr = urlA->lpVtbl->GetURL(urlA, &url); ok(SUCCEEDED(hr), "getting uninitialized URL unexpectedly failed, hr=0x%x\n", hr); - ok(url == NULL, "unitialized URL is not NULL but %s\n", url); + ok(url == NULL, "uninitialized URL is not NULL but %s\n", url); hr = urlA->lpVtbl->SetURL(urlA, NULL, 0); ok(SUCCEEDED(hr), "setting NULL URL unexpectedly failed, hr=0x%x\n", hr); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d269406..60d77f0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3882,7 +3882,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * This usually means that ARB_tex_npot is supported in hardware as long as the application is staying * within the limits enforced by the ARB_texture_rectangle extension. This however is not true for the * FX series, which instantly falls back to a slower software path as soon as ARB_tex_npot is used. - * We therefore completly remove ARB_tex_npot from the list of supported extensions. + * We therefore completely remove ARB_tex_npot from the list of supported extensions. * * Note that wine_normalized_texrect can't be used in this case because internally it uses ARB_tex_npot, * triggering the software fallback. There is not much we can do here apart from disabling the diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6ba3a32..1e50f36 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -267,13 +267,15 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded, second index should not exist.\n"); - /* Try to fetch the header info with a buffer thats big enough to fit string but not NULL terminator. */ + /* Try to fetch the header info with a buffer that's big enough to fit the + * string but not the NULL terminator. + */ index = 0; len = 5*sizeof(WCHAR); memcpy(buffer, check_buffer, sizeof(buffer)); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, test_header_name, buffer, &len, &index); - ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded with a buffer thats too small.\n"); + ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded with a buffer that's too small.\n"); ok(memcmp(buffer, check_buffer, sizeof(buffer)) == 0, "WinHttpQueryHeaders failed, modified the buffer when it should not have.\n"); ok(len == 6*sizeof(WCHAR), "WinHttpQueryHeaders returned invalid length, expected 12, got %d\n", len); @@ -289,7 +291,7 @@ static void test_WinHttpAddHeaders(void) ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); - /* Try with a NULL buffer and a length thats too small */ + /* Try with a NULL buffer and a length that's too small */ index = 0; len = 10; SetLastError(0xdeadbeef);

1 0

Alistair Leslie-Hughes : mshtml: Add dispinterface DispHTMLBody.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 521a69fa5180f4ef45f5255167cfd6ea89db33f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521a69fa5180f4ef45f525516… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 28 22:35:13 2008 +1000 mshtml: Add dispinterface DispHTMLBody. --- include/mshtml.idl | 956 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 956 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=521a69fa5180f4ef45f52…

1 0

Alistair Leslie-Hughes : mshtml: Add missing interfaces.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: e2c3be83fdc8559999f239f705aa851d410129e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c3be83fdc8559999f239f70… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 1 21:23:56 2008 +1000 mshtml: Add missing interfaces. --- include/mshtml.idl | 486 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 485 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2c3be83fdc8559999f23…

1 0

Alistair Leslie-Hughes : mshtml: Add missing IDispatchEx tids.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: cf86ff8f7e63a810876040e4d8a5806d472b0b3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf86ff8f7e63a810876040e4d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 1 22:01:49 2008 +1000 mshtml: Add missing IDispatchEx tids. --- dlls/mshtml/dispex.c | 8 ++++++++ dlls/mshtml/mshtml_private.h | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4e44130..587d953 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -66,6 +66,7 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, &DIID_DispDOMChildrenCollection, + &DIID_DispHTMLBody, &DIID_DispHTMLCommentElement, &DIID_DispHTMLDocument, &DIID_DispHTMLDOMTextNode, @@ -78,7 +79,10 @@ static REFIID tid_ids[] = { &DIID_DispHTMLStyle, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, + &IID_IHTMLBodyElement, + &IID_IHTMLBodyElement2, &IID_IHTMLCommentElement, + &IID_IHTMLControlElement, &IID_IHTMLDocument2, &IID_IHTMLDocument3, &IID_IHTMLDocument4, @@ -89,6 +93,8 @@ static REFIID tid_ids[] = { &IID_IHTMLDOMTextNode, &IID_IHTMLElement, &IID_IHTMLElement2, + &IID_IHTMLElement3, + &IID_IHTMLElement4, &IID_IHTMLElementCollection, &IID_IHTMLGenericElement, &IID_IHTMLImgElement, @@ -96,6 +102,8 @@ static REFIID tid_ids[] = { &IID_IHTMLOptionElement, &IID_IHTMLSelectElement, &IID_IHTMLStyle, + &IID_IHTMLTextContainer, + &IID_IHTMLUniqueName, &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IOmNavigator diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 88f444d..85329c5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -62,6 +62,7 @@ typedef struct event_target_t event_target_t; typedef enum { NULL_tid, DispDOMChildrenCollection_tid, + DispHTMLBody_tid, DispHTMLCommentElement_tid, DispHTMLDocument_tid, DispHTMLDOMTextNode_tid, @@ -74,7 +75,10 @@ typedef enum { DispHTMLStyle_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, + IHTMLBodyElement_tid, + IHTMLBodyElement2_tid, IHTMLCommentElement_tid, + IHTMLControlElement_tid, IHTMLDocument2_tid, IHTMLDocument3_tid, IHTMLDocument4_tid, @@ -85,6 +89,8 @@ typedef enum { IHTMLDOMTextNode_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, + IHTMLElement4_tid, IHTMLElementCollection_tid, IHTMLGenericElement_tid, IHTMLImgElement_tid, @@ -92,6 +98,8 @@ typedef enum { IHTMLOptionElement_tid, IHTMLSelectElement_tid, IHTMLStyle_tid, + IHTMLTextContainer_tid, + IHTMLUniqueName_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, IOmNavigator_tid,

1 0

Alistair Leslie-Hughes : mshtml: Add missing defines.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 48e493c9b7f9eab27d8cf23362af7d29fed23957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e493c9b7f9eab27d8cf2336… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 1 21:23:21 2008 +1000 mshtml: Add missing defines. --- include/mshtmdid.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index e0a1bf2..a830cf8 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1063,6 +1063,71 @@ #define DISPID_HTMLELEMENTEVENTS_ONFOCUSIN DISPID_EVMETH_ONFOCUSIN #define DISPID_HTMLELEMENTEVENTS_ONFOCUSOUT DISPID_EVMETH_ONFOCUSOUT +/* HTMLElementEvents2 */ + +#define DISPID_HTMLELEMENTEVENTS2_ONHELP DISPID_EVMETH_ONHELP +#define DISPID_HTMLELEMENTEVENTS2_ONCLICK DISPID_EVMETH_ONCLICK +#define DISPID_HTMLELEMENTEVENTS2_ONDBLCLICK DISPID_EVMETH_ONDBLCLICK +#define DISPID_HTMLELEMENTEVENTS2_ONKEYPRESS DISPID_EVMETH_ONKEYPRESS +#define DISPID_HTMLELEMENTEVENTS2_ONKEYDOWN DISPID_EVMETH_ONKEYDOWN +#define DISPID_HTMLELEMENTEVENTS2_ONKEYUP DISPID_EVMETH_ONKEYUP +#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEOUT DISPID_EVMETH_ONMOUSEOUT +#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEOVER DISPID_EVMETH_ONMOUSEOVER +#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEMOVE DISPID_EVMETH_ONMOUSEMOVE +#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEDOWN DISPID_EVMETH_ONMOUSEDOWN +#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEUP DISPID_EVMETH_ONMOUSEUP +#define DISPID_HTMLELEMENTEVENTS2_ONSELECTSTART DISPID_EVMETH_ONSELECTSTART +#define DISPID_HTMLELEMENTEVENTS2_ONFILTERCHANGE DISPID_EVMETH_ONFILTER +#define DISPID_HTMLELEMENTEVENTS2_ONDRAGSTART DISPID_EVMETH_ONDRAGSTART +#define DISPID_HTMLELEMENTEVENTS2_ONBEFOREUPDATE DISPID_EVMETH_ONBEFOREUPDATE +#define DISPID_HTMLELEMENTEVENTS2_ONAFTERUPDATE DISPID_EVMETH_ONAFTERUPDATE +#define DISPID_HTMLELEMENTEVENTS2_ONERRORUPDATE DISPID_EVMETH_ONERRORUPDATE +#define DISPID_HTMLELEMENTEVENTS2_ONROWEXIT DISPID_EVMETH_ONROWEXIT +#define DISPID_HTMLELEMENTEVENTS2_ONROWENTER DISPID_EVMETH_ONROWENTER +#define DISPID_HTMLELEMENTEVENTS2_ONDATASETCHANGED DISPID_EVMETH_ONDATASETCHANGED +#define DISPID_HTMLELEMENTEVENTS2_ONDATAAVAILABLE DISPID_EVMETH_ONDATAAVAILABLE +#define DISPID_HTMLELEMENTEVENTS2_ONDATASETCOMPLETE DISPID_EVMETH_ONDATASETCOMPLETE +#define DISPID_HTMLELEMENTEVENTS2_ONLOSECAPTURE DISPID_EVMETH_ONLOSECAPTURE +#define DISPID_HTMLELEMENTEVENTS2_ONPROPERTYCHANGE DISPID_EVMETH_ONPROPERTYCHANGE +#define DISPID_HTMLELEMENTEVENTS2_ONSCROLL DISPID_EVMETH_ONSCROLL +#define DISPID_HTMLELEMENTEVENTS2_ONFOCUS DISPID_EVMETH_ONFOCUS +#define DISPID_HTMLELEMENTEVENTS2_ONBLUR DISPID_EVMETH_ONBLUR +#define DISPID_HTMLELEMENTEVENTS2_ONRESIZE DISPID_EVMETH_ONRESIZE +#define DISPID_HTMLELEMENTEVENTS2_ONDRAG DISPID_EVMETH_ONDRAG +#define DISPID_HTMLELEMENTEVENTS2_ONDRAGEND DISPID_EVMETH_ONDRAGEND +#define DISPID_HTMLELEMENTEVENTS2_ONDRAGENTER DISPID_EVMETH_ONDRAGENTER +#define DISPID_HTMLELEMENTEVENTS2_ONDRAGOVER DISPID_EVMETH_ONDRAGOVER +#define DISPID_HTMLELEMENTEVENTS2_ONDRAGLEAVE DISPID_EVMETH_ONDRAGLEAVE +#define DISPID_HTMLELEMENTEVENTS2_ONDROP DISPID_EVMETH_ONDROP +#define DISPID_HTMLELEMENTEVENTS2_ONBEFORECUT DISPID_EVMETH_ONBEFORECUT +#define DISPID_HTMLELEMENTEVENTS2_ONCUT DISPID_EVMETH_ONCUT +#define DISPID_HTMLELEMENTEVENTS2_ONBEFORECOPY DISPID_EVMETH_ONBEFORECOPY +#define DISPID_HTMLELEMENTEVENTS2_ONCOPY DISPID_EVMETH_ONCOPY +#define DISPID_HTMLELEMENTEVENTS2_ONBEFOREPASTE DISPID_EVMETH_ONBEFOREPASTE +#define DISPID_HTMLELEMENTEVENTS2_ONPASTE DISPID_EVMETH_ONPASTE +#define DISPID_HTMLELEMENTEVENTS2_ONCONTEXTMENU DISPID_EVMETH_ONCONTEXTMENU +#define DISPID_HTMLELEMENTEVENTS2_ONROWSDELETE DISPID_EVMETH_ONROWSDELETE +#define DISPID_HTMLELEMENTEVENTS2_ONROWSINSERTED DISPID_EVMETH_ONROWSINSERTED +#define DISPID_HTMLELEMENTEVENTS2_ONCELLCHANGE DISPID_EVMETH_ONCELLCHANGE +#define DISPID_HTMLELEMENTEVENTS2_ONREADYSTATECHANGE DISPID_EVMETH_ONREADYSTATECHANGE +#define DISPID_HTMLELEMENTEVENTS2_ONLAYOUTCOMPLETE DISPID_EVMETH_ONLAYOUTCOMPLETE +#define DISPID_HTMLELEMENTEVENTS2_ONPAGE DISPID_EVMETH_ONPAGE +#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEENTER DISPID_EVMETH_ONMOUSEENTER +#define DISPID_HTMLELEMENTEVENTS2_ONMOUSELEAVE DISPID_EVMETH_ONMOUSELEAVE +#define DISPID_HTMLELEMENTEVENTS2_ONACTIVATE DISPID_EVMETH_ONACTIVATE +#define DISPID_HTMLELEMENTEVENTS2_ONDEACTIVATE DISPID_EVMETH_ONDEACTIVATE +#define DISPID_HTMLELEMENTEVENTS2_ONBEFOREDEACTIVATE DISPID_EVMETH_ONBEFOREDEACTIVATE +#define DISPID_HTMLELEMENTEVENTS2_ONBEFOREACTIVATE DISPID_EVMETH_ONBEFOREACTIVATE +#define DISPID_HTMLELEMENTEVENTS2_ONFOCUSIN DISPID_EVMETH_ONFOCUSIN +#define DISPID_HTMLELEMENTEVENTS2_ONFOCUSOUT DISPID_EVMETH_ONFOCUSOUT +#define DISPID_HTMLELEMENTEVENTS2_ONMOVE DISPID_EVMETH_ONMOVE +#define DISPID_HTMLELEMENTEVENTS2_ONCONTROLSELECT DISPID_EVMETH_ONCONTROLSELECT +#define DISPID_HTMLELEMENTEVENTS2_ONMOVESTART DISPID_EVMETH_ONMOVESTART +#define DISPID_HTMLELEMENTEVENTS2_ONMOVEEND DISPID_EVMETH_ONMOVEEND +#define DISPID_HTMLELEMENTEVENTS2_ONRESIZESTART DISPID_EVMETH_ONRESIZESTART +#define DISPID_HTMLELEMENTEVENTS2_ONRESIZEEND DISPID_EVMETH_ONRESIZEEND +#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEWHEEL DISPID_EVMETH_ONMOUSEWHEEL + /* IHTMLElement */ #define DISPID_IHTMLELEMENT_SETATTRIBUTE (DISPID_HTMLOBJECT+1) #define DISPID_IHTMLELEMENT_GETATTRIBUTE (DISPID_HTMLOBJECT+2) @@ -2211,4 +2276,19 @@ #define DISPID_IHTMLFRAMEBASE2_READYSTATE DISPID_A_READYSTATE #define DISPID_IHTMLFRAMEBASE2_ALLOWTRANSPARENCY DISPID_A_ALLOWTRANSPARENCY +/* IHTMLControlElement */ +#define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX +#define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) +#define DISPID_IHTMLCONTROLELEMENT_ACCESSKEY (DISPID_SITE+5) +#define DISPID_IHTMLCONTROLELEMENT_ONBLUR DISPID_EVPROP_ONBLUR +#define DISPID_IHTMLCONTROLELEMENT_ONFOCUS DISPID_EVPROP_ONFOCUS +#define DISPID_IHTMLCONTROLELEMENT_ONRESIZE DISPID_EVPROP_ONRESIZE +#define DISPID_IHTMLCONTROLELEMENT_BLUR (DISPID_SITE+2) +#define DISPID_IHTMLCONTROLELEMENT_ADDFILTER (DISPID_SITE+17) +#define DISPID_IHTMLCONTROLELEMENT_REMOVEFILTER (DISPID_SITE+18) +#define DISPID_IHTMLCONTROLELEMENT_CLIENTHEIGHT (DISPID_SITE+19) +#define DISPID_IHTMLCONTROLELEMENT_CLIENTWIDTH (DISPID_SITE+20) +#define DISPID_IHTMLCONTROLELEMENT_CLIENTTOP (DISPID_SITE+21) +#define DISPID_IHTMLCONTROLELEMENT_CLIENTLEFT (DISPID_SITE+22) + #endif /* __MSHTMDID_H__ */

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLBodyElement.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: ad76cc1f7cbf4f3217b0bb22305eacbca3e4d937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad76cc1f7cbf4f3217b0bb223… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 27 22:01:35 2008 +1000 mshtml: Implement IDispatch for IHTMLBodyElement. --- dlls/mshtml/htmlbody.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 8e1f70c..2d30895 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -110,16 +110,14 @@ static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->textcont.element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLBodyElement_GetTypeInfo(IHTMLBodyElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->textcont.element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLBodyElement_GetIDsOfNames(IHTMLBodyElement *iface, REFIID riid, @@ -127,9 +125,7 @@ static HRESULT WINAPI HTMLBodyElement_GetIDsOfNames(IHTMLBodyElement *iface, REF LCID lcid, DISPID *rgDispId) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->textcont.element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dispIdMember, @@ -137,9 +133,8 @@ static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dis VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->textcont.element.node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLBodyElement_put_background(IHTMLBodyElement *iface, BSTR v)

1 0

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 September 2008