June 2008 - Wine-commits - list.winehq.org

Paul Vriens : msi/tests: Fix some test failures.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 61daa613ddc61c58ec1388fe5b5e071f6a14dd93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61daa613ddc61c58ec1388fe5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jun 19 10:32:42 2008 +0200 msi/tests: Fix some test failures. Results on test.winehq.org show failures for at least Vista as new DISPID's are known there. --- dlls/msi/tests/automation.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index f2e5c13..3a35d4a 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -554,16 +554,6 @@ static void test_dispid(void) } dispid = get_dispid(pInstaller, "RelatedProducts"); ok(dispid == 40, "Expected 40, got %d\n", dispid); - dispid = get_dispid(pInstaller, "RemovePatches"); - ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ApplyMultiplePatches"); - ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ProductsEx"); - ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %d\n", dispid); - dispid = get_dispid(pInstaller, "PatchesEx"); - ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ExtractPatchXMLData"); - ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %d\n", dispid); todo_wine { dispid = get_dispid(pInstaller, "PatchInfo"); @@ -583,20 +573,28 @@ static void test_dispid(void) dispid = get_dispid(pInstaller, "FileSignatureInfo"); ok(dispid == 48, "Expected 48, got %d\n", dispid); } - - /* MSDN claims the following functions exist but IDispatch->GetIDsOfNames disagrees */ + dispid = get_dispid(pInstaller, "RemovePatches"); + ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %d\n", dispid); + dispid = get_dispid(pInstaller, "ApplyMultiplePatches"); + ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %d\n", dispid); + dispid = get_dispid(pInstaller, "ProductsEx"); + ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %d\n", dispid); + dispid = get_dispid(pInstaller, "PatchesEx"); + ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %d\n", dispid); + dispid = get_dispid(pInstaller, "ExtractPatchXMLData"); + ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %d\n", dispid); dispid = get_dispid( pInstaller, "ProductElevated" ); - ok(dispid == -1, "Expected -1, got %d\n", dispid); - dispid = get_dispid( pInstaller, "ProductInfoFromScript" ); - ok(dispid == -1, "Expected -1, got %d\n", dispid); + ok(dispid == 59 || dispid == -1, "Expected 59 or -1, got %d\n", dispid); dispid = get_dispid( pInstaller, "ProvideAssembly" ); - ok(dispid == -1, "Expected -1, got %d\n", dispid); - dispid = get_dispid( pInstaller, "CreateAdvertiseScript" ); - ok(dispid == -1, "Expected -1, got %d\n", dispid); + ok(dispid == 60 || dispid == -1, "Expected 60 or -1, got %d\n", dispid); + dispid = get_dispid( pInstaller, "ProductInfoFromScript" ); + ok(dispid == 61 || dispid == -1, "Expected 61 or -1, got %d\n", dispid); dispid = get_dispid( pInstaller, "AdvertiseProduct" ); - ok(dispid == -1, "Expected -1, got %d\n", dispid); + ok(dispid == 62 || dispid == -1, "Expected 62 or -1, got %d\n", dispid); + dispid = get_dispid( pInstaller, "CreateAdvertiseScript" ); + ok(dispid == 63 || dispid == -1, "Expected 63 or -1, got %d\n", dispid); dispid = get_dispid( pInstaller, "PatchFiles" ); - ok(dispid == -1, "Expected -1, got %d\n", dispid); + ok(dispid == 65 || dispid == -1, "Expected 65 or -1, got %d\n", dispid); } /* Test basic IDispatch functions */

1 0

Rob Shearman : shell32: Free the correct pointer in XDG_UserDirLookup.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: ff838008393cf57431013aac84d919e5c18c75d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff838008393cf57431013aac8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jun 19 07:51:26 2008 +0100 shell32: Free the correct pointer in XDG_UserDirLookup. out_ptr is a stack variable. *out_ptr is heap allocated and is what was meant to be freed. --- dlls/shell32/xdg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index c578b90..6eb13a2 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -963,7 +963,7 @@ xdg_user_dir_lookup_error: if (FAILED(hr)) { for (i = 0; i < num_dirs; i++) HeapFree(GetProcessHeap(), 0, out[i]); - HeapFree(GetProcessHeap(), 0, out_ptr); + HeapFree(GetProcessHeap(), 0, *out_ptr); } return hr; }

1 0

Rob Shearman : include: Update the MIDL_STUB_MESSAGE structure.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 52911fc66c53816d7df1b417ca50ec25e24f9e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52911fc66c53816d7df1b417c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jun 19 07:50:51 2008 +0100 include: Update the MIDL_STUB_MESSAGE structure. Reduce the size of the IsClient field, as is done in the latest SDKs to fix NdrClientInitializeNew tests on XP SP3 and Win2003+. --- dlls/rpcrt4/tests/generated.c | 1 - include/rpcndr.h | 4 +++- tools/winapi/tests.dat | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 2307f08..9c4a5a7 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -407,7 +407,6 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, BufferLength, 20, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, MemorySize, 24, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char *, Memory, 28, 4, 4); - TEST_FIELD(MIDL_STUB_MESSAGE, int, IsClient, 32, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, int, ReuseBuffer, 36, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, struct NDR_ALLOC_ALL_NODES_CONTEXT *, pAllocAllNodesContext, 40, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, struct NDR_POINTER_QUEUE_STATE *, pPointerQueueState, 44, 4, 4); diff --git a/include/rpcndr.h b/include/rpcndr.h index 7938529..a0968d5 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -175,7 +175,9 @@ typedef struct _MIDL_STUB_MESSAGE ULONG BufferLength; ULONG MemorySize; unsigned char *Memory; - int IsClient; + unsigned char IsClient; + unsigned char Pad; + unsigned short uFlags2; int ReuseBuffer; struct NDR_ALLOC_ALL_NODES_CONTEXT *pAllocAllNodesContext; struct NDR_POINTER_QUEUE_STATE *pPointerQueueState; diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 8c159b3..1214909 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -950,7 +950,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount +MIDL_STUB_MESSAGE: !UniquePtrCount !IsClient !Pad !uFlags2 MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT

1 0

H. Verbeet : wined3d: Use gl_Color and gl_SecondaryColor to support more varyings in SM3. 0 shaders.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: a6fa6a4a318ac8ebb069fffa107ccb7d99a00407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fa6a4a318ac8ebb069fffa1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 19 00:36:35 2008 +0200 wined3d: Use gl_Color and gl_SecondaryColor to support more varyings in SM3.0 shaders. SM3.0 requires 10 4 component float varyings for passing stuff between vertex and pixel shaders. GF7 and earlier report 8 generic varyings + gl_Color and gl_SecondaryColor in GLSL. This patch allows us to use gl_Color and gl_SecondaryColor to get 2 extra varyings, which some games, like C&C3 with highest gfx settings, require. --- dlls/wined3d/glsl_shader.c | 147 ++++++++++++++++++++++++++++----------- dlls/wined3d/pixelshader.c | 2 + dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 109 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6fa6a4a318ac8ebb069f…

1 0

H. Verbeet : wined3d: Add support for ARB_color_buffer_float.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 4a4ab5f2ae9c4772c6b546dfd7e9d150f34300d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4ab5f2ae9c4772c6b546dfd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 19 00:36:28 2008 +0200 wined3d: Add support for ARB_color_buffer_float. --- dlls/wined3d/directx.c | 1 + include/wine/wined3d_gl.h | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f47f0f8..61ab9d1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -61,6 +61,7 @@ static const struct { {"GL_ATI_fragment_shader", ATI_FRAGMENT_SHADER, 0 }, /* ARB */ + {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT, 0 }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS, 0 }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM, 0 }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER, 0 }, diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 6ff1df9..2062507 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1502,6 +1502,16 @@ BOOL (WINAPI *pwglShareLists)(HGLRC,HGLRC); * #defines and functions pointer ****************************************************/ +/* GL_ARB_color_buffer_float */ +#ifndef GL_ARB_color_buffer_float +#define GL_RGBA_FLOAT_MODE_ARB 0x8820 +#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A +#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B +#define GL_CLAMP_READ_COLOR_ARB 0x891C +#define GL_FIXED_ONLY_ARB 0x891D +#endif +typedef void (WINE_GLAPI *PGLFNCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); + /* GL_ARB_depth_texture */ #ifndef GL_ARB_depth_texture #define GL_ARB_depth_texture 1 @@ -3286,6 +3296,7 @@ typedef enum _GL_PSVersion { /* OpenGL Supported Extensions (ARB and EXT) */ typedef enum _GL_SupportedExt { /* ARB */ + ARB_COLOR_BUFFER_FLOAT, ARB_DRAW_BUFFERS, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, @@ -3387,6 +3398,8 @@ typedef enum _GL_SupportedExt { ****************************************************/ #define GL_EXT_FUNCS_GEN \ /** ARB Extensions **/ \ + /* GL_ARB_color_buffer_float */ \ + USE_GL_FUNC(PGLFNCLAMPCOLORARBPROC, glClampColorARB, ARB_COLOR_BUFFER_FLOAT, NULL );\ /* GL_ARB_draw_buffers */ \ USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, glDrawBuffersARB, ARB_DRAW_BUFFERS, NULL );\ /* GL_ARB_imaging, GL_EXT_blend_minmax */ \

1 0

Colin Finck : comctl32: Use a clip region when collapsing the treeview.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 985b6e9c01683ff65db948a3a6c7bf784959b06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=985b6e9c01683ff65db948a3a… Author: Colin Finck <mail(a)colinfinck.de> Date: Mon Jun 9 23:57:58 2008 +0200 comctl32: Use a clip region when collapsing the treeview. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index fb67c24..28b822e 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3209,7 +3209,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, { scrollRect.top = nextItem->rect.top; - ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, + ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, &scrollRect, NULL, NULL, SW_ERASE | SW_INVALIDATE); TREEVIEW_Invalidate(infoPtr, wineItem); } else {

1 0

Colin Finck : wininet: Always pass a variable as lpNumberOfBytesWritten on a WriteFile call if lpOverlapped is set to NULL .
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: bbd550ad5c8afd45612e386201efb96feaf666a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd550ad5c8afd45612e38620… Author: Colin Finck <mail(a)colinfinck.de> Date: Mon Jun 16 01:05:20 2008 +0200 wininet: Always pass a variable as lpNumberOfBytesWritten on a WriteFile call if lpOverlapped is set to NULL. --- dlls/wininet/http.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b973a79..79e3511 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1619,8 +1619,9 @@ static DWORD HTTP_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *re if(req->lpszCacheFile) { BOOL res; + DWORD dwBytesWritten; - res = WriteFile(req->hCacheFile, buffer, bytes_read, NULL, NULL); + res = WriteFile(req->hCacheFile, buffer, bytes_read, &dwBytesWritten, NULL); if(!res) WARN("WriteFile failed: %u\n", GetLastError()); } @@ -1688,7 +1689,9 @@ static DWORD HTTP_ReadChunked(WININETHTTPREQW *req, void *buffer, DWORD size, DW if (req->lpszCacheFile) { - if (!WriteFile(req->hCacheFile, p, bytes_read, NULL, NULL)) + DWORD dwBytesWritten; + + if (!WriteFile(req->hCacheFile, p, bytes_read, &dwBytesWritten, NULL)) WARN("WriteFile failed: %u\n", GetLastError()); } p += bytes_read;

1 0

Jacek Caban : mshtml: Forward HTMLInputElement IDispatch calls to IDispatchEx implementation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: fd5c64dc2caa60d45605d1070956bb7eb3314795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5c64dc2caa60d45605d1070… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:10:48 2008 -0500 mshtml: Forward HTMLInputElement IDispatch calls to IDispatchEx implementation. --- dlls/mshtml/htmlinput.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 5674b0b..92a1f48 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -70,16 +70,16 @@ static ULONG WINAPI HTMLInputElement_Release(IHTMLInputElement *iface) static HRESULT WINAPI HTMLInputElement_GetTypeInfoCount(IHTMLInputElement *iface, UINT *pctinfo) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLInputElement_GetTypeInfo(IHTMLInputElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLInputElement_GetIDsOfNames(IHTMLInputElement *iface, REFIID riid, @@ -87,9 +87,9 @@ static HRESULT WINAPI HTMLInputElement_GetIDsOfNames(IHTMLInputElement *iface, R LCID lcid, DISPID *rgDispId) { HTMLInputElement *This = HTMLINPUT_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->element.node.dispex), riid, rgszNames, + cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLInputElement_Invoke(IHTMLInputElement *iface, DISPID dispIdMember, @@ -97,9 +97,9 @@ static HRESULT WINAPI HTMLInputElement_Invoke(IHTMLInputElement *iface, DISPID d VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLInputElement *This = HTMLINPUT_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->element.node.dispex), dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLInputElement_put_type(IHTMLInputElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Added IHTMLInputElement::put_value implementation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 4360ee4d8b1501a3fadd1823f7974de4886c61e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4360ee4d8b1501a3fadd1823f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:10:15 2008 -0500 mshtml: Added IHTMLInputElement::put_value implementation. --- dlls/mshtml/htmlinput.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 5b605b3..5674b0b 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -137,8 +137,18 @@ static HRESULT WINAPI HTMLInputElement_get_type(IHTMLInputElement *iface, BSTR * static HRESULT WINAPI HTMLInputElement_put_value(IHTMLInputElement *iface, BSTR v) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString val_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&val_str, v); + nsres = nsIDOMHTMLInputElement_SetValue(This->nsinput, &val_str); + nsAString_Finish(&val_str); + if(NS_FAILED(nsres)) + ERR("SetValue failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_value(IHTMLInputElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ac30c12..8bc3861 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -843,6 +843,47 @@ static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VA ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); } +#define test_input_value(o,t) _test_input_value(__LINE__,o,t) +static void _test_input_value(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLInputElement *input; + BSTR bstr; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IHTMLInputElement_get_value(input, &bstr); + ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line) (!strcmp_wa(bstr, exval), "value=%s\n", dbgstr_w(bstr)); + else + ok_(__FILE__,line) (!exval, "exval != NULL\n"); + SysFreeString(bstr); + IHTMLInputElement_Release(input); +} + +#define test_input_put_value(o,v) _test_input_put_value(__LINE__,o,v) +static void _test_input_put_value(unsigned line, IUnknown *unk, const char *val) +{ + IHTMLInputElement *input; + BSTR bstr; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + if(FAILED(hres)) + return; + + bstr = a2bstr(val); + hres = IHTMLInputElement_get_value(input, &bstr); + ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); + SysFreeString(bstr); + IHTMLInputElement_Release(input); +} + #define get_child_nodes(u) _get_child_nodes(__LINE__,u) static IHTMLDOMChildrenCollection *_get_child_nodes(unsigned line, IUnknown *unk) { @@ -1735,6 +1776,9 @@ static void test_elems(IHTMLDocument2 *doc) test_node_get_value_str((IUnknown*)elem, NULL); test_node_put_value_str((IUnknown*)elem, "test"); test_node_get_value_str((IUnknown*)elem, NULL); + test_input_value((IUnknown*)elem, NULL); + test_input_put_value((IUnknown*)elem, "test"); + test_input_value((IUnknown*)elem, NULL); IHTMLInputElement_Release(input); IHTMLElement_Release(elem);

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_clientHeight implementation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: b54a3a0314a4f5daca4dfe7c4078f1b579ec2f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54a3a0314a4f5daca4dfe7c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:09:26 2008 -0500 mshtml: Added IHTMLElement::get_clientHeight implementation. --- dlls/mshtml/htmlelem2.c | 18 ++++++++++++++++-- dlls/mshtml/tests/dom.c | 27 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index d68d0f4..fa4457a 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -500,8 +500,22 @@ static HRESULT WINAPI HTMLElement2_removeFilter(IHTMLElement2 *iface, IUnknown * static HRESULT WINAPI HTMLElement2_get_clientHeight(IHTMLElement2 *iface, long *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 height=0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_GetClientHeight(nselem, &height); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMHTMLNSElement: %08x\n", nsres); + } + + *p = height; + return S_OK; } static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, long *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7269ad1..ac30c12 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -376,6 +376,17 @@ static IHTMLElement *_get_elem_iface(unsigned line, IUnknown *unk) return elem; } +#define get_elem2_iface(u) _get_elem2_iface(__LINE__,u) +static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement2, (void**)&elem); + ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement2: %08x\n", hres); + return elem; +} + #define get_node_iface(u) _get_node_iface(__LINE__,u) static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) { @@ -940,6 +951,21 @@ static void _test_node_put_value_str(unsigned line, IUnknown *unk, const char *v VariantClear(&var); } +#define test_elem_client_size(u) _test_elem_client_size(__LINE__,u) +static void _test_elem_client_size(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + long l; + HRESULT hres; + + hres = IHTMLElement2_get_clientWidth(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_clientWidth failed: %08x\n", hres); + hres = IHTMLElement2_get_clientHeight(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_clientHeight failed: %08x\n", hres); + + IHTMLElement2_Release(elem); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1704,6 +1730,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_id((IUnknown*)elem, "in"); test_elem_put_id((IUnknown*)elem, "newin"); test_input_get_disabled(input, VARIANT_FALSE); + test_elem_client_size((IUnknown*)elem); test_node_get_value_str((IUnknown*)elem, NULL); test_node_put_value_str((IUnknown*)elem, "test");

1 0