winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
1001 discussions
Start a n
N
ew thread
Andrew Talbot : quartz: Assign to structs instead of using CopyMemory.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Andrew Talbot : qcap: Assign to struct instead of using CopyMemory.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Andrew Talbot : ole32: Assign to structs instead of using CopyMemory.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Andrew Talbot : uxtheme: Assign to struct instead of using CopyMemory.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Andrew Talbot : dsound: Assign to structs instead of using CopyMemory.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Jacek Caban : mshtml: Added parsing external scripts support.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Jacek Caban : mshtml: Added parsing inline script support.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Jacek Caban : mshtml: Return S_OK in OnEnterScript and OnLeaveScript.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Jacek Caban : mshtml: Added IActiveScriptSite::GetItemInfo implementation.
by Alexandre Julliard
31 Mar '08
31 Mar '08
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
0
0
Jacek Caban : mshtml: Added IActiveScriptSite::GetLCID implementation.
by Alexandre Julliard
31 Mar '08
31 Mar '08
Module: wine Branch: master Commit: b24151b5df3b4dbfc055f402228657115b7edc54 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b24151b5df3b4dbfc055f4022…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 29 17:35:02 2008 +0000 mshtml: Added IActiveScriptSite::GetLCID implementation. --- dlls/mshtml/script.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 2610787..6d41d32 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -244,8 +244,11 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *plcid) { ScriptHost *This = ACTSCPSITE_THIS(iface); - FIXME("(%p)->(%p)\n", This, plcid); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, plcid); + + *plcid = GetUserDefaultLCID(); + return S_OK; } static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPCOLESTR pstrName,
1
0
0
0
← Newer
1
2
3
4
5
6
...
101
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
Results per page:
10
25
50
100
200