April 2012 - Wine-commits - list.winehq.org

Aric Stewart : strmbase: Expand BaseRenderer implementation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 662220f77fd219107f525503c4656f8d78d6f021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=662220f77fd219107f525503c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:07 2012 -0500 strmbase: Expand BaseRenderer implementation. --- dlls/quartz/nullrenderer.c | 7 ++- dlls/strmbase/renderer.c | 126 ++++++++++++++++++++++++++++++++++++++++++-- include/wine/strmbase.h | 9 +++ 3 files changed, 136 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=662220f77fd219107f525…

1 0

Aric Stewart : quartz: Convert DsoundRenderer to use strmbase BaseRenderer.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 821ead201d38ebca8f3e92e71bf7b6c8641b5ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=821ead201d38ebca8f3e92e71… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:16 2012 -0500 quartz: Convert DsoundRenderer to use strmbase BaseRenderer. --- dlls/quartz/dsoundrender.c | 773 ++++++++++++++++---------------------------- 1 files changed, 280 insertions(+), 493 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=821ead201d38ebca8f3e9…

1 0

Aric Stewart : strmbase: More additions to BaseRenderer for video renderers .
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: e1a72011e52d6a76ee3824adb61066da89475940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a72011e52d6a76ee3824adb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:25 2012 -0500 strmbase: More additions to BaseRenderer for video renderers. --- dlls/strmbase/renderer.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 4 ++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1d3f3b5..3f665f7 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -82,6 +82,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_Disconnect(IPin * iface) if (renderer->pFuncsTable->pfnBreakConnect) hr = renderer->pFuncsTable->pfnBreakConnect(renderer); } + BaseRendererImpl_ClearPendingSample(renderer); LeaveCriticalSection(This->pin.pCritSec); return hr; @@ -254,6 +255,9 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb InitializeCriticalSection(&This->csRenderLock); This->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); This->evComplete = CreateEventW(NULL, TRUE, TRUE, NULL); + This->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); + This->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + This->pMediaSample = NULL; } return hr; @@ -291,7 +295,11 @@ ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) This->csRenderLock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csRenderLock); + + BaseRendererImpl_ClearPendingSample(This); CloseHandle(This->evComplete); + CloseHandle(This->ThreadSignal); + CloseHandle(This->RenderEvent); } return refCount; } @@ -318,6 +326,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } } + This->pMediaSample = pSample; + IMediaSample_AddRef(pSample); + if (This->pFuncsTable->pfnPrepareReceive) hr = This->pFuncsTable->pfnPrepareReceive(This, pSample); if (FAILED(hr)) @@ -368,6 +379,8 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp if (SUCCEEDED(hr)) hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); + + BaseRendererImpl_ClearPendingSample(This); LeaveCriticalSection(&This->csRenderLock); return hr; @@ -405,6 +418,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->evComplete); + SetEvent(This->ThreadSignal); + SetEvent(This->RenderEvent); } LeaveCriticalSection(&This->csRenderLock); @@ -423,6 +438,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) goto out; SetEvent(This->evComplete); + ResetEvent(This->ThreadSignal); if (This->pInputPin->pin.pConnectedTo) { @@ -443,6 +459,9 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { if (This->pFuncsTable->pfnOnStartStreaming) This->pFuncsTable->pfnOnStartStreaming(This); + if (This->filter.state == State_Stopped) + BaseRendererImpl_ClearPendingSample(This); + SetEvent(This->RenderEvent); This->filter.state = State_Running; } out: @@ -469,9 +488,14 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) } else if (This->pFuncsTable->pfnOnStopStreaming) This->pFuncsTable->pfnOnStopStreaming(This); + + if (This->filter.state == State_Stopped) + BaseRendererImpl_ClearPendingSample(This); + ResetEvent(This->RenderEvent); This->filter.state = State_Paused; } } + ResetEvent(This->ThreadSignal); LeaveCriticalSection(&This->csRenderLock); return S_OK; @@ -520,6 +544,9 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface) HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); + BaseRendererImpl_ClearPendingSample(iface); + SetEvent(iface->ThreadSignal); + SetEvent(iface->RenderEvent); return S_OK; } @@ -527,5 +554,17 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); RendererPosPassThru_ResetMediaTime(iface->pPosition); + ResetEvent(iface->ThreadSignal); + ResetEvent(iface->RenderEvent); + return S_OK; +} + +HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface) +{ + if (iface->pMediaSample) + { + IMediaSample_Release(iface->pMediaSample); + iface->pMediaSample = NULL; + } return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 46544ba..7e25c04 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -583,6 +583,9 @@ typedef struct BaseRendererTag IUnknown *pPosition; CRITICAL_SECTION csRenderLock; HANDLE evComplete; + HANDLE ThreadSignal; + HANDLE RenderEvent; + IMediaSample *pMediaSample; const struct BaseRendererFuncTable * pFuncsTable; } BaseRenderer; @@ -639,6 +642,7 @@ HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsT HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface); HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface); HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface); +HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface); HRESULT WINAPI BaseRenderer_Init(BaseRenderer *This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable);

1 0

Jacek Caban : jscript: Emit undefined statement return for switch without default clausule.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 353553e0aa716e14ed5788fbc4818ffe23b99eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=353553e0aa716e14ed5788fbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 13:45:23 2012 +0200 jscript: Emit undefined statement return for switch without default clausule. --- dlls/jscript/compile.c | 5 ++++- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1cbe5cb..0a66348 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1515,8 +1515,11 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t return hres; assert(i == case_cnt); - if(!have_default) + if(!have_default) { instr_ptr(ctx, default_jmp)->arg1.uint = ctx->code_off; + if(!push_instr(ctx, OP_undefined)) + return E_OUTOFMEMORY; + } label_set_addr(ctx, stat_ctx.break_label); return S_OK; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 8f5e5d5..41374e2 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -719,6 +719,13 @@ case false: } ok(state === "default", "state = " + state); +switch(1) { +case 2: + ok(false, "unexpected case 2"); +case 3: + ok(false, "unexpected case 3"); +} + tmp = eval("1"); ok(tmp === 1, "eval(\"1\") !== 1"); eval("{ ok(tmp === 1, 'eval: tmp !== 1'); } tmp = 2;");

1 0

Jacek Caban : jscript: Fixed parsing /=/ regexp.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 114a439fed9f4fadc8a5a3ab27af869297f2321c URL: http://source.winehq.org/git/wine.git/?a=commit;h=114a439fed9f4fadc8a5a3ab2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 13:46:11 2012 +0200 jscript: Fixed parsing /=/ regexp. --- dlls/jscript/lex.c | 3 +-- dlls/jscript/tests/regexp.js | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index dcdb3f3..4cf4d41 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -963,8 +963,7 @@ literal_t *parse_regexp(parser_ctx_t *ctx) TRACE("\n"); - while(*ctx->ptr != '/') - ctx->ptr--; + while(*--ctx->ptr != '/'); re = ++ctx->ptr; while(ctx->ptr < ctx->end && *ctx->ptr != '/') { diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index e9f26ef..c7f9363 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -580,4 +580,7 @@ ok(i === 1, "String.prototype.seatch.apply(obj, 'b') = " + i); i = " undefined ".search(); ok(i === null, "' undefined '.search() = " + i); +tmp = "=)".replace(/=/, "?"); +ok(tmp === "?)", "'=)'.replace(/=/, '?') = " + tmp); + reportSuccess();

1 0

Huw Davies : winspool: Propagate the printer's devmode to a new job.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 0b9a3f9de44075c16541ee98ca9c787f25d74aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9a3f9de44075c16541ee98c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 2 11:42:36 2012 +0100 winspool: Propagate the printer's devmode to a new job. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d832b4b..c50a894 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2311,7 +2311,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); job->document_title = strdupW(default_doc_title); job->printer_name = strdupW(printer->name); - job->devmode = NULL; + job->devmode = dup_devmode( printer->devmode ); list_add_tail(&printer->queue->jobs, &job->entry); *pcbNeeded = (len + 1) * sizeof(WCHAR) + sizeof(*addjob);

1 0

Huw Davies : wineps: Use the unicode version of StartDocPrinter.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: d963a8f864a495f7230dc6fe717d71e61ae51d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d963a8f864a495f7230dc6fe7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 2 14:14:08 2012 +0100 wineps: Use the unicode version of StartDocPrinter. --- dlls/wineps.drv/escape.c | 68 ++++++++------------------------------------- dlls/wineps.drv/init.c | 18 +++++++++--- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 26 insertions(+), 62 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index eff7500..66a1a89 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -409,15 +409,15 @@ INT PSDRV_EndPage( PHYSDEV dev ) /************************************************************************ - * PSDRV_StartDocA + * PSDRV_StartDoc */ -static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) +INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - DOC_INFO_1A di; + DOC_INFO_1W di; - TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_a(doc->lpszDocName), - debugstr_a(doc->lpszOutput), debugstr_a(doc->lpszDatatype)); + TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_w(doc->lpszDocName), + debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype)); if(physDev->job.id) { FIXME("hJob != 0. Now what?\n"); @@ -431,21 +431,21 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) return 0; } - di.pDocName = (LPSTR) doc->lpszDocName; + di.pDocName = (LPWSTR) doc->lpszDocName; di.pDatatype = NULL; if(doc->lpszOutput) - di.pOutputFile = (LPSTR) doc->lpszOutput; + di.pOutputFile = (LPWSTR) doc->lpszOutput; else if(physDev->job.output) di.pOutputFile = physDev->job.output; else di.pOutputFile = NULL; - TRACE("using output: %s\n", debugstr_a(di.pOutputFile)); + TRACE("using output: %s\n", debugstr_w(di.pOutputFile)); /* redirection located in HKCU\Software\Wine\Printing\Spooler is done during winspool.drv,ScheduleJob */ - physDev->job.id = StartDocPrinterA(physDev->job.hprinter, 1, (LPBYTE) &di); + physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); if(!physDev->job.id) { WARN("StartDocPrinter() failed: %d\n", GetLastError()); ClosePrinter(physDev->job.hprinter); @@ -458,8 +458,9 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) physDev->job.in_passthrough = FALSE; physDev->job.had_passthrough_rect = FALSE; if(doc->lpszDocName) { - physDev->job.DocName = HeapAlloc(GetProcessHeap(), 0, strlen(doc->lpszDocName)+1); - strcpy(physDev->job.DocName, doc->lpszDocName); + INT len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0, NULL, NULL ); + physDev->job.DocName = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, physDev->job.DocName, len, NULL, NULL ); } else physDev->job.DocName = NULL; @@ -467,51 +468,6 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) } /************************************************************************ - * PSDRV_StartDoc - */ -INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) -{ - DOCINFOA docA; - INT ret, len; - LPSTR docname = NULL, output = NULL, datatype = NULL; - - TRACE("(%p, %p) => %d,%s,%s,%s\n", dev, doc, doc->cbSize, debugstr_w(doc->lpszDocName), - debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype)); - - docA.cbSize = doc->cbSize; - if (doc->lpszDocName) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0, NULL, NULL ); - if ((docname = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, docname, len, NULL, NULL ); - } - if (doc->lpszOutput) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszOutput, -1, NULL, 0, NULL, NULL ); - if ((output = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszOutput, -1, output, len, NULL, NULL ); - } - if (doc->lpszDatatype) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDatatype, -1, NULL, 0, NULL, NULL ); - if ((datatype = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszDatatype, -1, datatype, len, NULL, NULL ); - } - docA.lpszDocName = docname; - docA.lpszOutput = output; - docA.lpszDatatype = datatype; - docA.fwType = doc->fwType; - - ret = PSDRV_StartDocA(dev, &docA); - - HeapFree( GetProcessHeap(), 0, docname ); - HeapFree( GetProcessHeap(), 0, output ); - HeapFree( GetProcessHeap(), 0, datatype ); - - return ret; -} - -/************************************************************************ * PSDRV_EndDoc */ INT PSDRV_EndDoc( PHYSDEV dev ) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index fa47573..c6a4488 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -41,6 +41,7 @@ #include "winnls.h" #include "psdrv.h" #include "winspool.h" +#include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" @@ -171,6 +172,17 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } +static inline WCHAR *strdupW( const WCHAR *str ) +{ + int size; + WCHAR *ret; + + if (!str) return NULL; + size = (strlenW( str ) + 1) * sizeof(WCHAR); + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) memcpy( ret, str, size ); + return ret; +} static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) { @@ -355,11 +367,7 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - if (output && *output) { - INT len = WideCharToMultiByte( CP_ACP, 0, output, -1, NULL, 0, NULL, NULL ); - if ((physDev->job.output = HeapAlloc( PSDRV_Heap, 0, len ))) - WideCharToMultiByte( CP_ACP, 0, output, -1, physDev->job.output, len, NULL, NULL ); - } + if (output && *output) physDev->job.output = strdupW( output ); if(initData) { DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, initData); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 3bcad2c..fd82bd5 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -346,7 +346,7 @@ typedef struct { typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ - LPSTR output; /* Output file/port */ + LPWSTR output; /* Output file/port */ LPSTR DocName; /* Document Name */ BOOL banding; /* Have we received a NEXTBAND */ BOOL OutOfPage; /* Page header not sent yet */

1 0

Jacek Caban : mshtml.idl: Added DispHTMLMetaElement declaration.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 30a477d36bfec1d2675f3dffeed1403846cb6d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a477d36bfec1d2675f3dffe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 15:52:39 2012 +0200 mshtml.idl: Added DispHTMLMetaElement declaration. --- include/mshtmdid.h | 13 +++++++++++ include/mshtml.idl | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 6190537..a062131 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2402,6 +2402,19 @@ /* IHTMLTitleElement */ #define DISPID_IHTMLTITLEELEMENT_TEXT DISPID_A_VALUE +/* IHTMLMetaElement */ +#define DISPID_IHTMLMETAELEMENT_HTTPEQUIV DISPID_HEDELEMS+1 +#define DISPID_IHTMLMETAELEMENT_CONTENT DISPID_HEDELEMS+2 +#define DISPID_IHTMLMETAELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLMETAELEMENT_URL DISPID_HEDELEMS+3 +#define DISPID_IHTMLMETAELEMENT_CHARSET DISPID_HEDELEMS+13 + +/* IHTMLMetaElement2 */ +#define DISPID_IHTMLMETAELEMENT2_SCHEME DISPID_HEDELEMS+20 + +/* IHTMLMetaElement3 */ +#define DISPID_IHTMLMETAELEMENT3_IE8_URL DISPID_IE8_META + /* IHTMLRect */ #define DISPID_IHTMLRECT_LEFT DISPID_OMRECT+1 #define DISPID_IHTMLRECT_TOP DISPID_OMRECT+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index fd4a509..2b532be 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9657,7 +9657,63 @@ methods: } /***************************************************************************** - * DispHTMLUnknownElement interface + * DispHTMLMetaElement dispinterface + */ +[ + hidden, + uuid(3050f517-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLMetaElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + void httpEquiv(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + BSTR httpEquiv(); + + [propput, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + void content(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + BSTR content(); + + [propput, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + void url(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + BSTR url(); + + [propput, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + void charset(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + BSTR charset(); + + [propput, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + void scheme(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + BSTR scheme(); + + [propput, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + void ie8_url(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + BSTR ie8_url(); +} + +/***************************************************************************** + * DispHTMLUnknownElement dispinterface */ [ hidden,

1 0

Jacek Caban : mshtml.idl: Added IHTMLMetaElement* declarations.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 5d8d4b8f3f8fc2e83e8892136fb8ad7317e958de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8d4b8f3f8fc2e83e8892136… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 15:52:54 2012 +0200 mshtml.idl: Added IHTMLMetaElement* declarations. --- include/mshtml.idl | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 2b532be..a6a9954 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9611,6 +9611,84 @@ interface IHTMLTitleElement : IDispatch } /***************************************************************************** + * IHTMLMetaElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f203-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + HRESULT httpEquiv([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + HRESULT httpEquiv([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + HRESULT content([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + HRESULT content([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + HRESULT name([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + HRESULT url([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + HRESULT url([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + HRESULT charset([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + HRESULT charset([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLMetaElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f81f-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + HRESULT scheme([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + HRESULT scheme([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLMetaElement3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510495-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement3 : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + HRESULT url([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + HRESULT url([out, retval] BSTR *p); +} + +/***************************************************************************** * DispHTMLHeadElement interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement stub implementation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 2d206abeac725a15bfb2bb74387d66403d263138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d206abeac725a15bfb2bb743… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 15:53:07 2012 +0200 mshtml: Added IHTMLMetaElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlmeta.c | 255 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 ++- 5 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d206abeac725a15bfb2b…

1 0