November 2010 - Wine-commits

Henri Verbeet : wined3d: Rename the wined3d_format "Flags" field to "flags" .
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: efb185dcd52e56493f6466529b88f0b2ae4dc516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb185dcd52e56493f6466529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 12 13:12:05 2010 +0100 wined3d: Rename the wined3d_format "Flags" field to "flags". --- dlls/wined3d/basetexture.c | 8 ++++---- dlls/wined3d/context.c | 12 ++++++------ dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 32 ++++++++++++++++---------------- dlls/wined3d/shader.c | 6 +++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 16 ++++++++-------- dlls/wined3d/surface_base.c | 12 ++++++------ dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 36 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 11 files changed, 67 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efb185dcd52e56493f646…

1 0

Hans Leidekker : programs: Add a stub implementation of regsvcs.exe.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: ab5fbebff587ae67e92c07c993f001b4130877d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5fbebff587ae67e92c07c99… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 12 13:07:40 2010 +0100 programs: Add a stub implementation of regsvcs.exe. --- configure | 1 + configure.ac | 1 + programs/regsvcs/Makefile.in | 8 ++++++++ programs/regsvcs/main.c | 33 +++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 5 files changed, 44 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 9b1cb22..3871a74 100755 --- a/configure +++ b/configure @@ -15186,6 +15186,7 @@ wine_fn_config_program progman enable_progman install wine_fn_config_program reg enable_reg install wine_fn_config_program regedit enable_regedit installbin wine_fn_config_test programs/regedit/tests regedit.exe_test +wine_fn_config_program regsvcs enable_regsvcs install wine_fn_config_program regsvr32 enable_regsvr32 installbin wine_fn_config_program rpcss enable_rpcss install wine_fn_config_program rundll.exe16 enable_win16 install diff --git a/configure.ac b/configure.ac index 04ed14f..93a6221 100644 --- a/configure.ac +++ b/configure.ac @@ -2843,6 +2843,7 @@ WINE_CONFIG_PROGRAM(progman,install) WINE_CONFIG_PROGRAM(reg,install) WINE_CONFIG_PROGRAM(regedit,installbin) WINE_CONFIG_TEST(programs/regedit/tests) +WINE_CONFIG_PROGRAM(regsvcs,install) WINE_CONFIG_PROGRAM(regsvr32,installbin) WINE_CONFIG_PROGRAM(rpcss,install) WINE_CONFIG_PROGRAM(rundll.exe16,install,enable_win16) diff --git a/programs/regsvcs/Makefile.in b/programs/regsvcs/Makefile.in new file mode 100644 index 0000000..4c808cd --- /dev/null +++ b/programs/regsvcs/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = regsvcs.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/regsvcs/main.c b/programs/regsvcs/main.c new file mode 100644 index 0000000..570686d --- /dev/null +++ b/programs/regsvcs/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(regsvcs); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 88b79ac..0bdfa36 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2600,6 +2600,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe 10,Microsoft.NET\Framework\v1.1.4322,ngen.exe 10,Microsoft.NET\Framework\v1.1.4322,fusion.dll +10,Microsoft.NET\Framework\v1.1.4322,regsvcs.exe 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,fusion.dll 10,Microsoft.NET\Framework\v4.0.30319,ngen.exe

1 0

Henri Verbeet : wined3d: Avoid marking samplers dirty in IWineD3DSurfaceImpl_Unmap().
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: db013ed2135738dfec611282614d087e97aed50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db013ed2135738dfec6112826… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 12 13:12:01 2010 +0100 wined3d: Avoid marking samplers dirty in IWineD3DSurfaceImpl_Unmap(). Resources are explicitly loaded in context_apply_draw_state() when needed, the resource location management takes care of all of this. --- dlls/wined3d/surface.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dbac947..9010482 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1900,18 +1900,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) else if (This == device->depth_stencil) { FIXME("Depth Stencil buffer locking is not implemented\n"); - } else { - /* The rest should be a normal texture */ - /* Check if the texture is bound, if yes dirtify the sampler to force a re-upload of the texture - * Can't load the texture here because PreLoad may destroy and recreate the gl texture, so sampler - * states need resetting - */ - if (This->container.type == WINED3D_CONTAINER_TEXTURE) - { - IWineD3DBaseTextureImpl *texture = This->container.u.texture; - if (texture->baseTexture.bindCount) - IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SAMPLER(texture->baseTexture.sampler)); - } } unlock_end:

1 0

Henri Verbeet : wined3d: Check for depth/ stencil surfaces in general in IWineD3DSurfaceImpl_Unmap().
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 4bd1f04fbd63ce37e781fb051524eb5730e0727c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd1f04fbd63ce37e781fb051… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 12 13:12:02 2010 +0100 wined3d: Check for depth/stencil surfaces in general in IWineD3DSurfaceImpl_Unmap(). Instead of just the current one. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9010482..8d848d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -10,7 +10,7 @@ * Copyright 2006-2008 Stefan Dösinger for CodeWeavers * Copyright 2007-2008 Henri Verbeet * Copyright 2006-2008 Roderick Colenbrander - * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2009-2010 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1897,7 +1897,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) This->dirtyRect.right = 0; This->dirtyRect.bottom = 0; } - else if (This == device->depth_stencil) + else if (This->resource.format->Flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) { FIXME("Depth Stencil buffer locking is not implemented\n"); }

1 0

Maarten Lankhorst : winegstreamer: Fix deadlock when changing state.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 096da45036959e57ae3aa5b0de0c06f69c651788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096da45036959e57ae3aa5b0d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 23:22:59 2010 +0100 winegstreamer: Fix deadlock when changing state. Leaving the lock is legal and required here since gstreamer has its own locking in place. gst_pad_push could otherwise deadlock. --- dlls/winegstreamer/gsttffilter.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index a304cc1..912439e 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -267,7 +267,9 @@ static HRESULT WINAPI Gstreamer_transform_ProcessEnd(TransformFilter *iface) { GstTfImpl *This = (GstTfImpl*)iface; int ret; + LeaveCriticalSection(&This->tf.filter.csFilter); ret = gst_element_set_state(This->filter, GST_STATE_READY); + EnterCriticalSection(&This->tf.filter.csFilter); TRACE("Returned: %i\n", ret); return S_OK; }

1 0

Maarten Lankhorst : winegstreamer: Fix support for seeking in demux.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 694ec2a48a29d08dcd80defdd8305d8af19b8e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694ec2a48a29d08dcd80defdd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 23:23:00 2010 +0100 winegstreamer: Fix support for seeking in demux. --- dlls/winegstreamer/gstdemux.c | 92 ++++++++++++++++++++++++++++++++++------ 1 files changed, 78 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4c9fd74..0af7014 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -419,7 +419,10 @@ static DWORD CALLBACK push_data(LPVOID iface) { DWORD_PTR user; HRESULT hr; - IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); + if (!This->stop) + IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); + else + maxlen = This->stop; TRACE("Starting..\n"); for (;;) { REFERENCE_TIME tStart, tStop; @@ -816,7 +819,8 @@ static gboolean query_function(GstPad *pad, GstQuery *query) { default: FIXME("Unhandled query type %i\n", GST_QUERY_TYPE(query)); case GST_QUERY_URI: - return 1; + case GST_QUERY_CONVERT: + return 0; } } @@ -830,6 +834,8 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { CloseHandle(This->push_thread); This->push_thread = NULL; } + if (This->filter.state == State_Stopped) + This->nextofs = This->start; } else if (!This->push_thread) { TRACE("Activating\n"); if (This->initial) @@ -942,8 +948,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI ERR("Returns: %i\n", ret); return E_FAIL; } - This->start = This->nextofs = This->nextpullofs = 0; - This->stop = This->filesize; + This->start = This->nextofs = This->nextpullofs = This->stop = 0; /* Add initial pins */ This->initial = This->discont = 1; @@ -963,6 +968,8 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_query_duration(This->ppPins[0]->their_src, &format, &duration); for (i = 0; i < This->cStreams; ++i) { This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; + if (!This->ppPins[i]->seek.llDuration) + This->ppPins[i]->seek.dwCapabilities = 0; WaitForSingleObject(This->ppPins[i]->caps_event, -1); } hr = S_OK; @@ -1253,18 +1260,10 @@ static const IBaseFilterVtbl GST_Vtbl = { }; static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface) { - GSTOutPin *This = impl_from_IMediaSeeking(iface); - GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, This->seek.llCurrent * 100, GST_SEEK_TYPE_NONE, -1); - TRACE("(%p) going to %i.%i!\n", iface, (int)(This->seek.llCurrent / 10000000), (int)((This->seek.llCurrent / 10000)%1000)); - gst_pad_push_event(This->my_sink, ev); return S_OK; } static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface) { - GSTOutPin *This = impl_from_IMediaSeeking(iface); - GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, 0, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_SET, This->seek.llStop); - TRACE("(%p) going to %i.%i!\n", iface, (int)(This->seek.llCurrent / 10000000), (int)((This->seek.llCurrent / 10000)%1000)); - gst_pad_push_event(This->my_sink, ev); return S_OK; } @@ -1291,6 +1290,71 @@ static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) { return IUnknown_Release((IUnknown *)This); } +static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFERENCE_TIME *pos) { + GSTOutPin *This = impl_from_IMediaSeeking(iface); + GstFormat format = GST_FORMAT_TIME; + + if (!pos) + return E_POINTER; + + if (!This->their_src) { + *pos = This->seek.llCurrent; + TRACE("Cached value\n"); + if (This->seek.llDuration) + return S_OK; + else + return E_NOTIMPL; + } + + if (!gst_pad_query_position(This->their_src, &format, pos)) { + WARN("Could not query position\n"); + return E_NOTIMPL; + } + *pos /= 100; + return S_OK; +} + +static GstSeekType type_from_flags(DWORD flags) { + switch (flags & AM_SEEKING_PositioningBitsMask) { + case AM_SEEKING_NoPositioning: return GST_SEEK_TYPE_NONE; + case AM_SEEKING_AbsolutePositioning: return GST_SEEK_TYPE_SET; + case AM_SEEKING_RelativePositioning: return GST_SEEK_TYPE_CUR; + case AM_SEEKING_IncrementalPositioning: return GST_SEEK_TYPE_END; + } + return GST_SEEK_TYPE_NONE; +} + + +static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, REFERENCE_TIME *pCur, DWORD curflags, REFERENCE_TIME *pStop, DWORD stopflags) { + HRESULT hr; + GSTOutPin *This = impl_from_IMediaSeeking(iface); + GstSeekFlags f = 0; + GstSeekType curtype, stoptype; + GstEvent *e; + + if (!This->seek.llDuration) + return E_NOTIMPL; + + hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); + if (!This->their_src) + return This->seek.llDuration ? hr : E_NOTIMPL; + + if (curflags & AM_SEEKING_SeekToKeyFrame) + f |= GST_SEEK_FLAG_KEY_UNIT; + if (curflags & AM_SEEKING_Segment) + f |= GST_SEEK_FLAG_SEGMENT; + if (!(curflags & AM_SEEKING_NoFlush)) + f |= GST_SEEK_FLAG_FLUSH; + + curtype = type_from_flags(curflags); + stoptype = type_from_flags(stopflags); + e = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, f, curtype, pCur ? *pCur * 100 : -1, stoptype, pStop ? *pStop * 100 : -1); + if (gst_pad_push_event(This->my_sink, e)) + return S_OK; + else + return E_NOTIMPL; +} + static const IMediaSeekingVtbl GST_Seeking_Vtbl = { GST_Seeking_QueryInterface, @@ -1305,9 +1369,9 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = SourceSeekingImpl_SetTimeFormat, SourceSeekingImpl_GetDuration, SourceSeekingImpl_GetStopPosition, - SourceSeekingImpl_GetCurrentPosition, + GST_Seeking_GetCurrentPosition, SourceSeekingImpl_ConvertTimeFormat, - SourceSeekingImpl_SetPositions, + GST_Seeking_SetPositions, SourceSeekingImpl_GetPositions, SourceSeekingImpl_GetAvailable, SourceSeekingImpl_SetRate,

1 0

Jacek Caban : mshtml: Added HTMLWindow's IServiceProvider implementation.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: c7e37fd6755905d2c9d76d2b2b28bd7514ae6df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e37fd6755905d2c9d76d2b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:30:36 2010 +0100 mshtml: Added HTMLWindow's IServiceProvider implementation. --- dlls/mshtml/htmlwindow.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/tests/htmldoc.c | 31 +++++++++++++++++++++++-- 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d406997..298f803 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -191,6 +191,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) { TRACE("(%p)->(IID_IHTMLPrivateWindow %p)\n", This, ppv); *ppv = HTMLPRIVWINDOW(This); + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = SERVPROV(This); }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -2114,6 +2117,52 @@ static const IDispatchExVtbl WindowDispExVtbl = { WindowDispEx_GetNameSpaceParent }; +#define SERVPROV_THIS(iface) DEFINE_THIS(HTMLWindow, ServiceProvider, iface) + +static HRESULT WINAPI HTMLWindowSP_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = SERVPROV_THIS(iface); + return IHTMLWindow2_QueryInterface(HTMLWINDOW2(This), riid, ppv); +} + +static ULONG WINAPI HTMLWindowSP_AddRef(IServiceProvider *iface) +{ + HTMLWindow *This = SERVPROV_THIS(iface); + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static ULONG WINAPI HTMLWindowSP_Release(IServiceProvider *iface) +{ + HTMLWindow *This = SERVPROV_THIS(iface); + return IHTMLWindow2_Release(HTMLWINDOW2(This)); +} + +static HRESULT WINAPI HTMLWindowSP_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) +{ + HTMLWindow *This = SERVPROV_THIS(iface); + + if(IsEqualGUID(guidService, &IID_IHTMLWindow2)) { + TRACE("IID_IHTMLWindow2\n"); + return IHTMLWindow2_QueryInterface(HTMLWINDOW2(This), riid, ppv); + } + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + if(!This->doc_obj) + return E_NOINTERFACE; + + return IServiceProvider_QueryService(SERVPROV(&This->doc_obj->basedoc), guidService, riid, ppv); +} + +#undef SERVPROV_THIS + +static const IServiceProviderVtbl ServiceProviderVtbl = { + HTMLWindowSP_QueryInterface, + HTMLWindowSP_AddRef, + HTMLWindowSP_Release, + HTMLWindowSP_QueryService +}; + static const tid_t HTMLWindow_iface_tids[] = { IHTMLWindow2_tid, IHTMLWindow3_tid, @@ -2153,6 +2202,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->lpHTMLWindow4Vtbl = &HTMLWindow4Vtbl; window->lpIHTMLPrivateWindowVtbl = &HTMLPrivateWindowVtbl; window->lpIDispatchExVtbl = &WindowDispExVtbl; + window->lpServiceProviderVtbl = &ServiceProviderVtbl; window->ref = 1; window->doc_obj = doc_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a909943..2bc96a7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -262,7 +262,8 @@ struct HTMLWindow { const IHTMLWindow3Vtbl *lpHTMLWindow3Vtbl; const IHTMLWindow4Vtbl *lpHTMLWindow4Vtbl; const IHTMLPrivateWindowVtbl *lpIHTMLPrivateWindowVtbl; - const IDispatchExVtbl *lpIDispatchExVtbl; + const IDispatchExVtbl *lpIDispatchExVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; LONG ref; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 80f137b..e8ce9b4 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4813,6 +4813,7 @@ static void test_HTMLDocument_http(void) static void test_QueryService(IHTMLDocument2 *doc, BOOL success) { + IHTMLWindow2 *window, *sp_window; IServiceProvider *sp; IHlinkFrame *hf; HRESULT hres; @@ -4821,12 +4822,36 @@ static void test_QueryService(IHTMLDocument2 *doc, BOOL success) ok(hres == S_OK, "QueryService returned %08x\n", hres); hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&hf); - if(SUCCEEDED(hres)) - IHlinkFrame_Release(hf); + if(!success) { + ok(hres == E_NOINTERFACE, "QueryService returned %08x, expected E_NOINTERFACE\n", hres); + IServiceProvider_Release(sp); + return; + } - ok(hres == (success?S_OK:E_NOINTERFACE), "QueryService returned %08x, expected %08x\n", hres, success?S_OK:E_NOINTERFACE); + ok(hres == S_OK, "QueryService(IID_IHlinkFrame) failed: %08x\n", hres); + ok(hf == &HlinkFrame, "hf != HlinkFrame\n"); + IHlinkFrame_Release(hf); IServiceProvider_Release(sp); + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(sp, &IID_IHTMLWindow2, &IID_IHTMLWindow2, (void**)&sp_window); + ok(hres == S_OK, "QueryService(IID_IHTMLWindow2) failed: %08x\n", hres); + /* FIXME: test returned window */ + IHTMLWindow2_Release(sp_window); + + hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&hf); + ok(hres == S_OK, "QueryService(IID_IHlinkFrame) failed: %08x\n", hres); + ok(hf == &HlinkFrame, "hf != HlinkFrame\n"); + IHlinkFrame_Release(hf); + + IServiceProvider_Release(sp); + IHTMLWindow2_Release(window); } static void test_HTMLDocument_StreamLoad(void)

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement::get_vspace implementation.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 6e796da74852e58c25c0642dca5340ab617dc312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e796da74852e58c25c0642dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:30:49 2010 +0100 mshtml: Added IHTMLObjectElement::get_vspace implementation. --- dlls/mshtml/htmlobject.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 09890cb..2af4faa 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -36,6 +36,8 @@ typedef struct { HTMLElement element; const IHTMLObjectElementVtbl *lpIHTMLObjectElementVtbl; + + nsIDOMHTMLObjectElement *nsobject; } HTMLObjectElement; #define HTMLOBJECT(x) (&(x)->lpIHTMLObjectElementVtbl) @@ -314,8 +316,19 @@ static HRESULT WINAPI HTMLObjectElement_put_vspace(IHTMLObjectElement *iface, LO static HRESULT WINAPI HTMLObjectElement_get_vspace(IHTMLObjectElement *iface, LONG *p) { HTMLObjectElement *This = HTMLOBJECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 vspace; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, &vspace); + if(NS_FAILED(nsres)) { + ERR("GetVspace failed: %08x\n", nsres); + return E_FAIL; + } + + *p = vspace; + return S_OK; } static HRESULT WINAPI HTMLObjectElement_put_hspace(IHTMLObjectElement *iface, LONG v) @@ -405,6 +418,9 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) { HTMLObjectElement *This = HTMLOBJECT_NODE_THIS(iface); + if(This->nsobject) + nsIDOMHTMLObjectElement_Release(This->nsobject); + HTMLElement_destructor(&This->element.node); } @@ -430,10 +446,16 @@ static dispex_static_data_t HTMLObjectElement_dispex = { HTMLElement *HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) { HTMLObjectElement *ret = heap_alloc_zero(sizeof(*ret)); + nsresult nsres; ret->lpIHTMLObjectElementVtbl = &HTMLObjectElementVtbl; ret->element.node.vtbl = &HTMLObjectElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLObjectElement_dispex); + + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLObjectElement iface: %08x\n", nsres); + return &ret->element; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index c7aaf88..0d82d7c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1640,6 +1640,51 @@ interface nsIDOMHTMLFrameElement : nsIDOMHTMLElement [ object, + uuid(a6cf90ac-15b3-11d2-932e-00805f8add32), + local +] +interface nsIDOMHTMLObjectElement : nsIDOMHTMLElement +{ + nsresult GetForm(nsIDOMHTMLFormElement **aForm); + nsresult GetCode(nsAString *aCode); + nsresult SetCode(const nsAString *aCode); + nsresult GetAlign(nsAString *aAlign); + nsresult SetAlign(const nsAString *aAlign); + nsresult GetArchive(nsAString *aArchive); + nsresult SetArchive(const nsAString *aArchive); + nsresult GetBorder(nsAString *aBorder); + nsresult SetBorder(const nsAString *aBorder); + nsresult GetCodeBase(nsAString *aCodeBase); + nsresult SetCodeBase(const nsAString *aCodeBase); + nsresult GetCodeType(nsAString *aCodeType); + nsresult SetCodeType(const nsAString *aCodeType); + nsresult GetData(nsAString *aData); + nsresult SetData(const nsAString *aData); + nsresult GetDeclare(PRBool *aDeclare); + nsresult SetDeclare(PRBool aDeclare); + nsresult GetHeight(nsAString *aHeight); + nsresult SetHeight(const nsAString *aHeight); + nsresult GetHspace(PRInt32 *aHspace); + nsresult SetHspace(PRInt32 aHspace); + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetStandby(nsAString *aStandby); + nsresult SetStandby(const nsAString *aStandby); + nsresult GetTabIndex(PRInt32 *aTabIndex); + nsresult SetTabIndex(PRInt32 aTabIndex); + nsresult GetType(nsAString *aType); + nsresult SetType(const nsAString *aType); + nsresult GetUseMap(nsAString *aUseMap); + nsresult SetUseMap(const nsAString *aUseMap); + nsresult GetVspace(PRInt32 *aVspace); + nsresult SetVspace(PRInt32 aVspace); + nsresult GetWidth(nsAString *aWidth); + nsresult SetWidth(const nsAString *aWidth); + nsresult GetContentDocument(nsIDOMDocument **aContentDocument); +} + +[ + object, uuid(94928ab3-8b63-11d3-989d-001083010e9b), local ] diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c1110ba..9ba45ce 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -48,7 +48,7 @@ static const char elem_test_str[] = "<textarea id=\"X\">text text</textarea>" "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\">\n</script>" - "<test /><object></object><embed />" + "<test /><object id=\"objid\" vspace=100></object><embed />" "<img id=\"imgid\" name=\"WineImg\"/>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "<form id=\"frm\"></form>" @@ -756,6 +756,17 @@ static IHTMLCommentElement *_get_comment_iface(unsigned line, IUnknown *unk) return comment; } +#define get_object_iface(u) _get_object_iface(__LINE__,u) +static IHTMLObjectElement *_get_object_iface(unsigned line, IUnknown *unk) +{ + IHTMLObjectElement *obj; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLObjectElement, (void**)&obj); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLObjectElement: %08x\n", hres); + return obj; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -1284,6 +1295,20 @@ static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) SysFreeString(text); } +#define test_object_vspace(u,s) _test_object_vspace(__LINE__,u,s) +static void _test_object_vspace(unsigned line, IUnknown *unk, LONG exl) +{ + IHTMLObjectElement *object = _get_object_iface(line, unk); + LONG l; + HRESULT hres; + + l = 0xdeadbeef; + hres = IHTMLObjectElement_get_vspace(object, &l); + ok_(__FILE__,line)(hres == S_OK, "get_vspace failed: %08x\n", hres); + ok_(__FILE__,line)(l == exl, "vspace=%d, expected %d\n", l, exl); + IHTMLObjectElement_Release(object); +} + #define create_option_elem(d,t,v) _create_option_elem(__LINE__,d,t,v) static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const char *txt, const char *val) @@ -6224,6 +6249,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "objid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_object_vspace((IUnknown*)elem, 100); + IHTMLElement_Release(elem); + } + elem = get_elem_by_id(doc, "a", TRUE); if(elem) { test_anchor_href((IUnknown*)elem, "http://test/");

1 0

Jacek Caban : mshtml.idl: Added IHTMLStyleElement and DispHTMLStyleElement declarations.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 7119b989236554c415c8b05d169cc882ea42d3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7119b989236554c415c8b05d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:31:06 2010 +0100 mshtml.idl: Added IHTMLStyleElement and DispHTMLStyleElement declarations. --- include/mshtmdid.h | 10 +++++ include/mshtml.idl | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 8d66633..d4f4201 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2596,6 +2596,16 @@ #define DISPID_IHTMLIFRAMEELEMENT2_HEIGHT STDPROPID_XOBJ_HEIGHT #define DISPID_IHTMLIFRAMEELEMENT2_WIDTH STDPROPID_XOBJ_WIDTH +/* IHTMLStyleElement */ +#define DISPID_IHTMLSTYLEELEMENT_TYPE DISPID_STYLEELEMENT+2 +#define DISPID_IHTMLSTYLEELEMENT_READYSTATE DISPID_A_READYSTATE +#define DISPID_IHTMLSTYLEELEMENT_ONREADYSTATECHANGE DISPID_EVPROP_ONREADYSTATECHANGE +#define DISPID_IHTMLSTYLEELEMENT_ONLOAD DISPID_EVPROP_ONLOAD +#define DISPID_IHTMLSTYLEELEMENT_ONERROR DISPID_EVPROP_ONERROR +#define DISPID_IHTMLSTYLEELEMENT_STYLESHEET DISPID_STYLEELEMENT+4 +#define DISPID_IHTMLSTYLEELEMENT_DISABLED STDPROPID_XOBJ_DISABLED +#define DISPID_IHTMLSTYLEELEMENT_MEDIA DISPID_STYLEELEMENT+6 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index a66aa74..d04494a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15574,6 +15574,101 @@ methods: } /***************************************************************************** + * IHTMLStyleElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f375-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyleElement : IDispatch +{ + [propput, id(DISPID_IHTMLSTYLEELEMENT_TYPE), displaybind, bindable] + HRESULT type([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_TYPE), displaybind, bindable] + HRESULT type([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_READYSTATE)] + HRESULT readyState([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLEELEMENT_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLSTYLEELEMENT_ONLOAD), displaybind, bindable] + HRESULT onload([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_ONLOAD), displaybind, bindable] + HRESULT onload([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLSTYLEELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([retval, out] VARIANT *p); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_STYLESHEET)] + HRESULT styleSheet([retval, out] IHTMLStyleSheet **p); + + [propput, id(DISPID_IHTMLSTYLEELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([retval, out] VARIANT_BOOL *p); + + [propput, id(DISPID_IHTMLSTYLEELEMENT_MEDIA), displaybind, bindable] + HRESULT media([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_MEDIA), displaybind, bindable] + HRESULT media([retval, out] BSTR *p); +} + +/***************************************************************************** + * DispHTMLStyleElement dispinterface + */ +[ + hidden, + uuid(3050f511-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLStyleElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLSTYLEELEMENT_TYPE), displaybind, bindable] + void type(BSTR v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_TYPE), displaybind, bindable] + BSTR type(); + + [propput, id(DISPID_IHTMLSTYLEELEMENT_ONLOAD), displaybind, bindable] + void onload(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_ONLOAD), displaybind, bindable] + VARIANT onload(); + + [propput, id(DISPID_IHTMLSTYLEELEMENT_ONERROR), displaybind, bindable] + void onerror(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_ONERROR), displaybind, bindable] + VARIANT onerror(); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_STYLESHEET)] + IHTMLStyleSheet *styleSheet(); + + [propput, id(DISPID_IHTMLSTYLEELEMENT_MEDIA), displaybind, bindable] + void media(BSTR v); + + [propget, id(DISPID_IHTMLSTYLEELEMENT_MEDIA), displaybind, bindable] + BSTR media(); +} + +/***************************************************************************** * IMarkupContainer interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLStyleElement stub implementation.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 16fbd05080aa1573095fcec5a415e6eaec005ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16fbd05080aa1573095fcec5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:31:24 2010 +0100 mshtml: Added IHTMLStyleElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmlstyleelem.c | 278 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 14 ++- 5 files changed, 298 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16fbd05080aa1573095fc…

1 0