March 2008 - Wine-Commits - list.winehq.org

Andrew Talbot : ole32: Assign to structs instead of using CopyMemory.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: c2599478b63e253a4f3651ae9c11a7d6f5790635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2599478b63e253a4f3651ae9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 29 11:37:15 2008 +0000 ole32: Assign to structs instead of using CopyMemory. --- dlls/ole32/ole2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b34235b..5cee7a1 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2811,7 +2811,7 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ return hr; /* this will deal with most cases */ - CopyMemory(pvarDest, pvarSrc, sizeof(*pvarDest)); + *pvarDest = *pvarSrc; switch(pvarSrc->vt) { @@ -2825,7 +2825,7 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ break; case VT_CLSID: pvarDest->u.puuid = CoTaskMemAlloc(sizeof(CLSID)); - CopyMemory(pvarDest->u.puuid, pvarSrc->u.puuid, sizeof(CLSID)); + *pvarDest->u.puuid = *pvarSrc->u.puuid; break; case VT_LPSTR: len = strlen(pvarSrc->u.pszVal);

1 0

Andrew Talbot : quartz: Assign to structs instead of using CopyMemory.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: 892c31e4db0f210974bbe9db5b226c6e954477bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=892c31e4db0f210974bbe9db5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 29 11:37:20 2008 +0000 quartz: Assign to structs instead of using CopyMemory. --- dlls/quartz/enumpins.c | 2 +- dlls/quartz/filesource.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/enumpins.c b/dlls/quartz/enumpins.c index 65e6759..61e42b0 100644 --- a/dlls/quartz/enumpins.c +++ b/dlls/quartz/enumpins.c @@ -45,7 +45,7 @@ HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** pp pEnumPins->lpVtbl = &IEnumPinsImpl_Vtbl; pEnumPins->refCount = 1; pEnumPins->uIndex = 0; - CopyMemory(&pEnumPins->enumPinDetails, pDetails, sizeof(ENUMPINDETAILS)); + pEnumPins->enumPinDetails = *pDetails; *ppEnum = (IEnumPins *)(&pEnumPins->lpVtbl); TRACE("Created new enumerator (%p)\n", *ppEnum); diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index c75f9a2..d922081 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -237,8 +237,8 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, TRACE("(%p, %s, %p, %p)\n", pReader, debugstr_w(pszFileName), majorType, minorType); - CopyMemory(majorType, &GUID_NULL, sizeof(*majorType)); - CopyMemory(minorType, &GUID_NULL, sizeof(*minorType)); + *majorType = GUID_NULL; + *minorType = GUID_NULL; lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &hkeyMediaType); hr = HRESULT_FROM_WIN32(lRet);

1 0

Andrew Talbot : qcap: Assign to struct instead of using CopyMemory.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: 2a0f7007d833e23a5c1f6d9dbc2c2e32d1bc97c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0f7007d833e23a5c1f6d9db… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 29 11:37:17 2008 +0000 qcap: Assign to struct instead of using CopyMemory. --- dlls/qcap/enumpins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/enumpins.c b/dlls/qcap/enumpins.c index 8b06fe7..c57c043 100644 --- a/dlls/qcap/enumpins.c +++ b/dlls/qcap/enumpins.c @@ -56,7 +56,7 @@ HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** pp pEnumPins->lpVtbl = &IEnumPinsImpl_Vtbl; pEnumPins->refCount = 1; pEnumPins->uIndex = 0; - CopyMemory(&pEnumPins->enumPinDetails, pDetails, sizeof(ENUMPINDETAILS)); + pEnumPins->enumPinDetails = *pDetails; *ppEnum = (IEnumPins *)(&pEnumPins->lpVtbl); ObjectRefCount(TRUE); return S_OK;

1 0

Jacek Caban : mshtml: Return S_OK in OnEnterScript and OnLeaveScript.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: 40ab8e0c17feb4e41ce3f29d3bb8773428437c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ab8e0c17feb4e41ce3f29d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 29 20:39:23 2008 +0000 mshtml: Return S_OK in OnEnterScript and OnLeaveScript. --- dlls/mshtml/script.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index a33e8db..26d3e00 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -313,15 +313,19 @@ static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, I static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) { ScriptHost *This = ACTSCPSITE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return S_OK; } static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) { ScriptHost *This = ACTSCPSITE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return S_OK; } #undef ACTSCPSITE_THIS

1 0

Andrew Talbot : dsound: Assign to structs instead of using CopyMemory.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: e8aebfcb4ba39b168a9494e226a65b150e8c1e1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8aebfcb4ba39b168a9494e22… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 29 11:37:12 2008 +0000 dsound: Assign to structs instead of using CopyMemory. --- dlls/dsound/capture.c | 2 +- dlls/dsound/dsound_main.c | 6 +++--- dlls/dsound/primary.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 05ab805..a7977d6 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1366,7 +1366,7 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( if (wfex->wFormatTag == WAVE_FORMAT_PCM) { device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)); - CopyMemory(device->pwfx, wfex, sizeof(WAVEFORMATEX)); + *device->pwfx = *wfex; device->pwfx->cbSize = 0; } else { device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)+wfex->cbSize); diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 2a1d1ca..d7c50b8 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -254,19 +254,19 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) if ( IsEqualGUID( &DSDEVID_DefaultPlayback, pGuidSrc ) || IsEqualGUID( &DSDEVID_DefaultVoicePlayback, pGuidSrc ) ) { - CopyMemory(pGuidDest, &DSOUND_renderer_guids[ds_default_playback], sizeof(GUID)); + *pGuidDest = DSOUND_renderer_guids[ds_default_playback]; TRACE("returns %s\n", get_device_id(pGuidDest)); return DS_OK; } if ( IsEqualGUID( &DSDEVID_DefaultCapture, pGuidSrc ) || IsEqualGUID( &DSDEVID_DefaultVoiceCapture, pGuidSrc ) ) { - CopyMemory(pGuidDest, &DSOUND_capture_guids[ds_default_capture], sizeof(GUID)); + *pGuidDest = DSOUND_capture_guids[ds_default_capture]; TRACE("returns %s\n", get_device_id(pGuidDest)); return DS_OK; } - CopyMemory(pGuidDest, pGuidSrc, sizeof(GUID)); + *pGuidDest = *pGuidSrc; TRACE("returns %s\n", get_device_id(pGuidDest)); return DS_OK; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index e5d31c6..112bb39 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1173,7 +1173,7 @@ HRESULT PrimaryBufferImpl_Create( dsb->device = device; dsb->lpVtbl = &dspbvt; - CopyMemory(&device->dsbd, dsbd, sizeof(*dsbd)); + device->dsbd = *dsbd; TRACE("Created primary buffer at %p\n", dsb); TRACE("(formattag=0x%04x,chans=%d,samplerate=%d,"

1 0

Jacek Caban : mshtml: Added parsing external scripts support.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: cb7b58c528c874f40c4d47319de19cc20bab5b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7b58c528c874f40c4d47319… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 29 20:57:48 2008 +0000 mshtml: Added parsing external scripts support. --- dlls/mshtml/navigate.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/script.c | 26 +++++++++++- 2 files changed, 136 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8ae064c..9ed1dea 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -718,6 +718,117 @@ HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback, IBindCtx *bctx) return S_OK; } +typedef struct { + BSCallback bsc; + + DWORD size; + BYTE *buf; + HRESULT hres; +} BufferBSC; + +#define BUFFERBSC_THIS(bsc) ((BufferBSC*) bsc) + +static void BufferBSC_destroy(BSCallback *bsc) +{ + BufferBSC *This = BUFFERBSC_THIS(bsc); + + heap_free(This->buf); + heap_free(This); +} + +static HRESULT BufferBSC_start_binding(BSCallback *bsc) +{ + return S_OK; +} + +static HRESULT BufferBSC_stop_binding(BSCallback *bsc, HRESULT result) +{ + BufferBSC *This = BUFFERBSC_THIS(bsc); + + This->hres = result; + + if(FAILED(result)) { + heap_free(This->buf); + This->buf = NULL; + This->size = 0; + } + + return S_OK; +} + +static HRESULT BufferBSC_read_data(BSCallback *bsc, IStream *stream) +{ + BufferBSC *This = BUFFERBSC_THIS(bsc); + DWORD readed; + HRESULT hres; + + if(!This->buf) { + This->size = 128; + This->buf = heap_alloc(This->size); + } + + do { + if(This->bsc.readed == This->size) { + This->size <<= 1; + This->buf = heap_realloc(This->buf, This->size); + } + + readed = 0; + hres = IStream_Read(stream, This->buf+This->bsc.readed, This->size-This->bsc.readed, &readed); + This->bsc.readed += readed; + }while(hres == S_OK); + + return S_OK; +} + +static HRESULT BufferBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR status_text) +{ + return S_OK; +} + +#undef BUFFERBSC_THIS + +static const BSCallbackVtbl BufferBSCVtbl = { + BufferBSC_destroy, + BufferBSC_start_binding, + BufferBSC_stop_binding, + BufferBSC_read_data, + BufferBSC_on_progress, +}; + + +static BufferBSC *create_bufferbsc(IMoniker *mon) +{ + BufferBSC *ret = heap_alloc_zero(sizeof(*ret)); + + init_bscallback(&ret->bsc, &BufferBSCVtbl, mon, 0); + ret->hres = E_FAIL; + + return ret; +} + +HRESULT bind_mon_to_buffer(HTMLDocument *doc, IMoniker *mon, void **buf) +{ + BufferBSC *bsc = create_bufferbsc(mon); + HRESULT hres; + + *buf = NULL; + + hres = start_binding(doc, &bsc->bsc, NULL); + if(SUCCEEDED(hres)) { + hres = bsc->hres; + if(SUCCEEDED(hres)) { + *buf = bsc->buf; + bsc->buf = NULL; + bsc->size = 0; + } + } + + IBindStatusCallback_Release(STATUSCLB(&bsc->bsc)); + + return hres; +} + struct nsChannelBSC { BSCallback bsc; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 40911de..15a939c 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -474,7 +474,31 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) { - FIXME("%p %s\n", script_host, debugstr_w(src)); + IMoniker *mon; + char *buf; + WCHAR *text; + HRESULT hres; + + static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; + + if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) + src += sizeof(wine_schemaW)/sizeof(WCHAR); + + hres = CreateURLMoniker(NULL, src, &mon); + if(FAILED(hres)) + return; + + hres = bind_mon_to_buffer(script_host->doc, mon, (void**)&buf); + IMoniker_Release(mon); + if(FAILED(hres)) + return; + + text = heap_strdupAtoW(buf); + heap_free(buf); + + parse_text(script_host, text); + + heap_free(text); } static void parse_inline_script(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript)

1 0

Jacek Caban : mshtml: Added parsing inline script support.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: 620a9500e25da9fdcda49a038869322ed8d29ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620a9500e25da9fdcda49a038… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 29 20:39:34 2008 +0000 mshtml: Added parsing inline script support. --- dlls/mshtml/script.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 26d3e00..40911de 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -452,6 +452,72 @@ static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) return ret; } +static void parse_text(ScriptHost *script_host, LPCWSTR text) +{ + EXCEPINFO excepinfo; + VARIANT var; + HRESULT hres; + + static const WCHAR script_endW[] = {'<','/','S','C','R','I','P','T','>',0}; + + TRACE("%s\n", debugstr_w(text)); + + VariantInit(&var); + memset(&excepinfo, 0, sizeof(excepinfo)); + hres = IActiveScriptParse_ParseScriptText(script_host->parse, text, windowW, NULL, script_endW, + 0, 0, SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE, + &var, &excepinfo); + if(FAILED(hres)) + WARN("ParseScriptText failed: %08x\n", hres); + +} + +static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) +{ + FIXME("%p %s\n", script_host, debugstr_w(src)); +} + +static void parse_inline_script(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) +{ + const PRUnichar *text; + nsAString text_str; + nsresult nsres; + + nsAString_Init(&text_str, NULL); + + nsres = nsIDOMHTMLScriptElement_GetText(nsscript, &text_str); + + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&text_str, &text); + parse_text(script_host, text); + }else { + ERR("GetText failed: %08x\n", nsres); + } + + nsAString_Finish(&text_str); +} + +static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) +{ + const PRUnichar *src; + nsAString src_str; + nsresult nsres; + + nsAString_Init(&src_str, NULL); + + nsres = nsIDOMHTMLScriptElement_GetSrc(nsscript, &src_str); + nsAString_GetData(&src_str, &src); + + if(NS_FAILED(nsres)) + ERR("GetSrc failed: %08x\n", nsres); + else if(*src) + parse_extern_script(script_host, src); + else + parse_inline_script(script_host, nsscript); + + nsAString_Finish(&src_str); +} + static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) { const WCHAR text_javascriptW[] = @@ -554,7 +620,14 @@ static ScriptHost *get_script_host(HTMLDocument *doc, nsIDOMHTMLScriptElement *n void doc_insert_script(HTMLDocument *doc, nsIDOMHTMLScriptElement *nsscript) { - get_script_host(doc, nsscript); + ScriptHost *script_host; + + script_host = get_script_host(doc, nsscript); + if(!script_host) + return; + + if(script_host->parse) + parse_script_elem(script_host, nsscript); } void release_script_hosts(HTMLDocument *doc)

1 0

Andrew Talbot : uxtheme: Assign to struct instead of using CopyMemory.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: 65dd1578e695aa140ca4858e94201fd8d235e0c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65dd1578e695aa140ca4858e9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 29 11:37:23 2008 +0000 uxtheme: Assign to struct instead of using CopyMemory. --- dlls/uxtheme/metric.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 1f8b069..6f8519e 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -135,7 +135,7 @@ HRESULT WINAPI GetThemeSysFont(HTHEME hTheme, int iFontID, LOGFONTW *plf) case TMT_MSGBOXFONT: font = &ncm.lfMessageFont; break; default: FIXME("Unknown FontID: %d\n", iFontID); break; } - if(font) CopyMemory(plf, font, sizeof(LOGFONTW)); + if(font) *plf = *font; else hr = STG_E_INVALIDPARAMETER; } return hr;

1 0

Jacek Caban : mshtml: Added IActiveScriptSiteWindow stub implementation.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: 2db8f1a160e2b08e2e434097525de7497e063315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db8f1a160e2b08e2e4340975… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 29 17:34:49 2008 +0000 mshtml: Added IActiveScriptSiteWindow stub implementation. --- dlls/mshtml/script.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index f0d9ae3..2610787 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -43,6 +43,7 @@ static const CLSID CLSID_JScript = typedef struct { const IActiveScriptSiteVtbl *lpIActiveScriptSiteVtbl; const IActiveScriptSiteInterruptPollVtbl *lpIActiveScriptSiteInterruptPollVtbl; + const IActiveScriptSiteWindowVtbl *lpIActiveScriptSiteWindowVtbl; LONG ref; @@ -59,6 +60,7 @@ typedef struct { #define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpIActiveScriptSiteVtbl) #define ACTSCPPOLL(x) ((IActiveScriptSiteInterruptPoll*) &(x)->lpIActiveScriptSiteInterruptPollVtbl) +#define ACTSCPWIN(x) ((IActiveScriptSiteWindow*) &(x)->lpIActiveScriptSiteWindowVtbl) static BOOL init_script_engine(ScriptHost *script_host) { @@ -200,6 +202,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSiteInterruptPoll, riid)) { TRACE("(%p)->(IID_IActiveScriptSiteInterruprtPoll %p)\n", This, ppv); *ppv = ACTSCPPOLL(This); + }else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) { + TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); + *ppv = ACTSCPWIN(This); }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -350,6 +355,51 @@ static const IActiveScriptSiteInterruptPollVtbl ActiveScriptSiteInterruptPollVtb ActiveScriptSiteInterruptPoll_QueryContinue }; +#define ACTSCPWIN_THIS(iface) DEFINE_THIS(ScriptHost, IActiveScriptSiteWindow, iface) + +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, + REFIID riid, void **ppv) +{ + ScriptHost *This = ACTSCPWIN_THIS(iface); + return IActiveScriptSite_QueryInterface(ACTSCPSITE(This), riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + ScriptHost *This = ACTSCPWIN_THIS(iface); + return IActiveScriptSite_AddRef(ACTSCPSITE(This)); +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + ScriptHost *This = ACTSCPWIN_THIS(iface); + return IActiveScriptSite_Release(ACTSCPSITE(This)); +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) +{ + ScriptHost *This = ACTSCPWIN_THIS(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) +{ + ScriptHost *This = ACTSCPWIN_THIS(iface); + FIXME("(%p)->(%x)\n", This, fEnable); + return E_NOTIMPL; +} + +#undef ACTSCPWIN_THIS + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) { ScriptHost *ret; @@ -358,8 +408,10 @@ static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) ret = heap_alloc_zero(sizeof(*ret)); ret->lpIActiveScriptSiteVtbl = &ActiveScriptSiteVtbl; ret->lpIActiveScriptSiteInterruptPollVtbl = &ActiveScriptSiteInterruptPollVtbl; + ret->lpIActiveScriptSiteWindowVtbl = &ActiveScriptSiteWindowVtbl; ret->ref = 1; ret->doc = doc; + ret->script_state = SCRIPTSTATE_UNINITIALIZED; ret->guid = *guid; list_add_tail(&doc->script_hosts, &ret->entry);

1 0

Jacek Caban : mshtml: Added IActiveScriptSite::GetItemInfo implementation.
by Alexandre Julliard March 31, 2008

March 31, 2008

Module: wine Branch: master Commit: 438350321163d99497a667000e9f5358be4e54bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=438350321163d99497a667000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 29 17:35:15 2008 +0000 mshtml: Added IActiveScriptSite::GetItemInfo implementation. --- dlls/mshtml/script.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 6d41d32..a33e8db 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -255,8 +255,27 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC DWORD dwReturnMask, IUnknown **ppiunkItem, ITypeInfo **ppti) { ScriptHost *This = ACTSCPSITE_THIS(iface); - FIXME("(%p)->(%s %x %p %p)\n", This, debugstr_w(pstrName), dwReturnMask, ppiunkItem, ppti); - return E_NOTIMPL; + + TRACE("(%p)->(%s %x %p %p)\n", This, debugstr_w(pstrName), dwReturnMask, ppiunkItem, ppti); + + if(dwReturnMask != SCRIPTINFO_IUNKNOWN) { + FIXME("Unsupported mask %x\n", dwReturnMask); + return E_NOTIMPL; + } + + *ppiunkItem = NULL; + + if(strcmpW(pstrName, windowW)) + return DISP_E_MEMBERNOTFOUND; + + if(!This->doc) + return E_FAIL; + + /* FIXME: Return proxy object */ + *ppiunkItem = (IUnknown*)HTMLWINDOW2(This->doc->window); + IUnknown_AddRef(*ppiunkItem); + + return S_OK; } static HRESULT WINAPI ActiveScriptSite_GetDocVersionString(IActiveScriptSite *iface, BSTR *pbstrVersion)

1 0