August 2012 - Wine-Commits - list.winehq.org

Aric Stewart : usp10: Cache OUTLINETEXTMETRICW in addition to TEXTMETRICW.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: ef5daa9aa56868a3d75d7d3a96d5bb946afed716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5daa9aa56868a3d75d7d3a9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 31 08:49:57 2012 -0500 usp10: Cache OUTLINETEXTMETRICW in addition to TEXTMETRICW. --- dlls/usp10/usp10.c | 9 +++++++++ dlls/usp10/usp10_internal.h | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9659e66..9bd55b4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -788,6 +788,7 @@ static inline BOOL set_cache_glyph_widths(SCRIPT_CACHE *psc, WORD glyph, ABC *ab static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) { ScriptCache *sc; + int size; if (!psc) return E_INVALIDARG; if (*psc) return S_OK; @@ -799,6 +800,13 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) heap_free(sc); return E_INVALIDARG; } + size = GetOutlineTextMetricsW(hdc, 0, NULL); + if (size) + { + sc->otm = heap_alloc(size); + sc->otm->otmSize = size; + GetOutlineTextMetricsW(hdc, size, sc->otm); + } if (!GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(LOGFONTW), &sc->lf)) { heap_free(sc); @@ -998,6 +1006,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->scripts[i].languages); } heap_free(((ScriptCache *)*psc)->scripts); + heap_free(((ScriptCache *)*psc)->otm); heap_free(*psc); *psc = NULL; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 15553eb..674db89 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -159,6 +159,7 @@ typedef struct { typedef struct { LOGFONTW lf; TEXTMETRICW tm; + OUTLINETEXTMETRICW *otm; BOOL sfnt; CacheGlyphPage *page[0x10]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE];

1 0

André Hentschel : winedbg: Add Coprocessor move operators to Thumb2 disassembler.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: ca3afdc156852d12d87948a41a8edbc96dc15e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3afdc156852d12d87948a41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 9 23:20:03 2012 +0200 winedbg: Add Coprocessor move operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 1362ef1..8e1b5b1 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -645,7 +645,7 @@ static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) if (op1 == 3 && op2 == 0) { - dbg_printf("\n\tclz\t%s, %s\t", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + dbg_printf("\n\tclz\t%s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); return 0; } @@ -666,7 +666,7 @@ static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) dbg_printf("\n\trevsh\t"); break; } - dbg_printf("%s, %s\t", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + dbg_printf("%s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); return 0; } @@ -683,7 +683,7 @@ static UINT thumb2_disasm_mul(UINT inst, ADDRESS64 *addr) if (op2 == 0 && get_nibble(inst, 3) != 0xf) { - dbg_printf("\n\tmla\t%s, %s, %s, %s\t", tbl_regs[get_nibble(inst, 2)], + dbg_printf("\n\tmla\t%s, %s, %s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], tbl_regs[get_nibble(inst, 3)]); @@ -692,7 +692,7 @@ static UINT thumb2_disasm_mul(UINT inst, ADDRESS64 *addr) if (op2 == 0 && get_nibble(inst, 3) == 0xf) { - dbg_printf("\n\tmul\t%s, %s, %s\t", tbl_regs[get_nibble(inst, 2)], + dbg_printf("\n\tmul\t%s, %s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); return 0; @@ -700,7 +700,7 @@ static UINT thumb2_disasm_mul(UINT inst, ADDRESS64 *addr) if (op2 == 1) { - dbg_printf("\n\tmls\t%s, %s, %s, %s\t", tbl_regs[get_nibble(inst, 2)], + dbg_printf("\n\tmls\t%s, %s, %s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], tbl_regs[get_nibble(inst, 3)]); @@ -734,7 +734,7 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) default: return inst; } - dbg_printf("%s, %s, %s, %s\t", tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 2)], + dbg_printf("%s, %s, %s, %s", tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); return 0; } @@ -752,7 +752,7 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) default: return inst; } - dbg_printf("%s, %s, %s\t", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], + dbg_printf("%s, %s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); return 0; } @@ -760,6 +760,23 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr) +{ + WORD opc1 = (inst >> 21) & 0x07; + WORD opc2 = (inst >> 5) & 0x07; + + if (opc2) + dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u, #%u", (inst & 0x00100000)?"mrc":"mcr", + (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, + tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0), opc2); + else + dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u", (inst & 0x00100000)?"mrc":"mcr", + (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, + tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0)); + + return 0; +} + struct inst_arm { UINT mask; @@ -825,6 +842,8 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff8000c0, 0xfb000000, thumb2_disasm_mul }, { 0xff8000f0, 0xfb800000, thumb2_disasm_longmuldiv }, { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv }, + { 0xef100010, 0xee100010, thumb2_disasm_coprocmov1 }, + { 0xef100010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0x00000000, 0x00000000, NULL } };

1 0

Jacek Caban : vbscript: Added IActiveScriptParseProcedure2 stub implementation.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 552db7aade5a9c68bf0423ad1b5bc4df5ca38716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552db7aade5a9c68bf0423ad1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:04:31 2012 +0200 vbscript: Added IActiveScriptParseProcedure2 stub implementation. --- dlls/vbscript/tests/vbscript.c | 12 +++++++++ dlls/vbscript/vbscript.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 8c05d31..fe53854 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -33,6 +33,8 @@ #define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#define IActiveScriptParseProcedure2_Release \ + IActiveScriptParseProcedure2_64_Release #else @@ -40,6 +42,8 @@ #define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#define IActiveScriptParseProcedure2_Release \ + IActiveScriptParseProcedure2_32_Release #endif @@ -339,6 +343,7 @@ static IActiveScript *create_vbscript(void) static void test_vbscript(void) { + IActiveScriptParseProcedure2 *parse_proc; IActiveScriptParse *parser; IActiveScript *vbscript; ULONG ref; @@ -390,6 +395,13 @@ static void test_vbscript(void) IActiveScriptParse_Release(parser); + hres = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParseProcedure, (void**)&parse_proc); + ok(hres == E_NOINTERFACE, "Got IActiveScriptParseProcedure interface, expected E_NOTIMPL\n"); + + hres = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); + ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 interface\n"); + IActiveScriptParseProcedure2_Release(parse_proc); + ref = IActiveScript_Release(vbscript); ok(!ref, "ref = %d\n", ref); } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index af037bd..a5a9853 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -30,17 +30,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define CTXARG_T DWORDLONG #define IActiveScriptParseVtbl IActiveScriptParse64Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl #else #define CTXARG_T DWORD #define IActiveScriptParseVtbl IActiveScriptParse32Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl #endif struct VBScript { IActiveScript IActiveScript_iface; IActiveScriptParse IActiveScriptParse_iface; + IActiveScriptParseProcedure2 IActiveScriptParseProcedure2_iface; IObjectSafety IObjectSafety_iface; LONG ref; @@ -224,6 +227,9 @@ static HRESULT WINAPI VBScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScriptParse)) { TRACE("(%p)->(IID_IActiveScriptParse %p)\n", This, ppv); *ppv = &This->IActiveScriptParse_iface; + }else if(IsEqualGUID(riid, &IID_IActiveScriptParseProcedure2)) { + TRACE("(%p)->(IID_IActiveScriptParseProcedure2 %p)\n", This, ppv); + *ppv = &This->IActiveScriptParseProcedure2_iface; }else if(IsEqualGUID(riid, &IID_IObjectSafety)) { TRACE("(%p)->(IID_IObjectSafety %p)\n", This, ppv); *ppv = &This->IObjectSafety_iface; @@ -610,6 +616,48 @@ static const IActiveScriptParseVtbl VBScriptParseVtbl = { VBScriptParse_ParseScriptText }; +static inline VBScript *impl_from_IActiveScriptParseProcedure2(IActiveScriptParseProcedure2 *iface) +{ + return CONTAINING_RECORD(iface, VBScript, IActiveScriptParseProcedure2_iface); +} + +static HRESULT WINAPI VBScriptParseProcedure_QueryInterface(IActiveScriptParseProcedure2 *iface, REFIID riid, void **ppv) +{ + VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI VBScriptParseProcedure_AddRef(IActiveScriptParseProcedure2 *iface) +{ + VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI VBScriptParseProcedure_Release(IActiveScriptParseProcedure2 *iface) +{ + VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptParseProcedure2 *iface, + LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, + LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, + CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) +{ + VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); + FIXME("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), + debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), + wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp); + return E_NOTIMPL; +} + +static const IActiveScriptParseProcedure2Vtbl VBScriptParseProcedureVtbl = { + VBScriptParseProcedure_QueryInterface, + VBScriptParseProcedure_AddRef, + VBScriptParseProcedure_Release, + VBScriptParseProcedure_ParseProcedureText, +}; + static inline VBScript *impl_from_IObjectSafety(IObjectSafety *iface) { return CONTAINING_RECORD(iface, VBScript, IObjectSafety_iface); @@ -685,6 +733,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->IActiveScript_iface.lpVtbl = &VBScriptVtbl; ret->IActiveScriptParse_iface.lpVtbl = &VBScriptParseVtbl; + ret->IActiveScriptParseProcedure2_iface.lpVtbl = &VBScriptParseProcedureVtbl; ret->IObjectSafety_iface.lpVtbl = &VBScriptSafetyVtbl; ret->ref = 1;

1 0

Jacek Caban : vbscript: Ignore fdexNameCaseSensitive flag.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: fe7533df49979653516131fd697c0558c599aa99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7533df49979653516131fd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:03:46 2012 +0200 vbscript: Ignore fdexNameCaseSensitive flag. --- dlls/vbscript/tests/run.c | 14 ++++++++++++++ dlls/vbscript/vbdisp.c | 4 +++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 099126d..d77c6cb 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -355,6 +355,20 @@ static void test_disp(IDispatch *disp) SysFreeString(str); ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); + id = 0xdeadbeef; + str = a2bstr("publicProp"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); + ok(id == public_prop_id, "id = %d, expected %d\n", id, public_prop_id); + + id = 0xdeadbeef; + str = a2bstr("publicprop"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); + ok(id == public_prop_id, "id = %d, expected %d\n", id, public_prop_id); + IDispatchEx_Release(dispex); } diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5f9d70a..022ac1d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -333,7 +333,9 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(!This->desc) return E_UNEXPECTED; - if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive)) { + /* Tests show that fdexNameCaseSensitive is ignored */ + + if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive|fdexNameCaseSensitive)) { FIXME("unsupported flags %x\n", grfdex); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Default to previous script type if not given.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 1b2525d1bf964fa4934705cb3cf0530fcbcbb35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2525d1bf964fa4934705cb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:03:27 2012 +0200 mshtml: Default to previous script type if not given. --- dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/script.c | 22 +++++++++++++--------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dd25263..b5117f1 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2626,6 +2626,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindo init_dispex(&window->dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); window->task_magic = get_task_target_magic(); + window->current_script_guid = CLSID_JScript; *ret = window; return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0bc9d4a..b0f00d3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -385,6 +385,7 @@ struct HTMLInnerWindow { HTMLDocumentNode *doc; struct list script_hosts; + GUID current_script_guid; IHTMLEventObj *event; @@ -982,6 +983,9 @@ DEFINE_GUID(CLSID_CMarkup,0x3050f4fb,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +DEFINE_GUID(CLSID_JScript, 0xf414c260,0x6ac0,0x11cf, 0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58); +DEFINE_GUID(CLSID_VBScript, 0xb54f3741,0x5b07,0x11cf, 0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8); + /* memory allocation functions */ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 55c7872..0fe4f5a 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -63,11 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR windowW[] = {'w','i','n','d','o','w',0}; static const WCHAR emptyW[] = {0}; -static const CLSID CLSID_JScript = - {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; -static const CLSID CLSID_VBScript = - {0xb54f3741,0x5b07,0x11cf,{0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8}}; - struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll_iface; @@ -646,6 +641,8 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) TRACE("%s\n", debugstr_w(text)); + script_host->window->current_script_guid = script_host->guid; + VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); @@ -758,7 +755,7 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) return TRUE; } -static BOOL get_script_guid(nsIDOMHTMLScriptElement *nsscript, GUID *guid) +static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { nsAString attr_str, val_str; BOOL ret = FALSE; @@ -793,7 +790,7 @@ static BOOL get_script_guid(nsIDOMHTMLScriptElement *nsscript, GUID *guid) if(*language) { ret = get_guid_from_language(language, guid); }else { - *guid = CLSID_JScript; + *guid = window->current_script_guid; ret = TRUE; } }else { @@ -822,7 +819,7 @@ void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscrip ScriptHost *script_host; GUID guid; - if(!get_script_guid(nsscript, &guid)) { + if(!get_script_guid(window, nsscript, &guid)) { WARN("Could not find script GUID\n"); return; } @@ -844,13 +841,15 @@ void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscrip IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) { ScriptHost *script_host; - GUID guid = CLSID_JScript; + GUID guid; const WCHAR *ptr; IDispatch *disp; HRESULT hres; static const WCHAR delimiterW[] = {'\"',0}; + TRACE("%s\n", debugstr_w(text)); + for(ptr = text; isalnumW(*ptr); ptr++); if(*ptr == ':') { LPWSTR language; @@ -872,6 +871,7 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) ptr++; }else { ptr = text; + guid = window->current_script_guid; } if(IsEqualGUID(&CLSID_JScript, &guid) @@ -880,6 +880,8 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) return NULL; } + window->current_script_guid = guid; + script_host = get_script_host(window, &guid); if(!script_host || !script_host->parse_proc) return NULL; @@ -921,6 +923,8 @@ HRESULT exec_script(HTMLInnerWindow *window, const WCHAR *code, const WCHAR *lan return E_FAIL; } + window->current_script_guid = guid; + memset(&ei, 0, sizeof(ei)); TRACE(">>>\n"); hres = IActiveScriptParse_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei);

1 0

Francois Gouget : dsound/tests: Clarify some skip() traces.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: ed7faad1ed51c7c4322a487d779f348b6d233a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7faad1ed51c7c4322a487d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 13 00:15:33 2012 +0200 dsound/tests: Clarify some skip() traces. --- dlls/dsound/tests/capture.c | 4 ++-- dlls/dsound/tests/ds3d.c | 2 +- dlls/dsound/tests/ds3d8.c | 4 ++-- dlls/dsound/tests/dsound.c | 2 +- dlls/dsound/tests/dsound8.c | 4 ++-- dlls/dsound/tests/duplex.c | 4 ++-- dlls/dsound/tests/propset.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 96fb417..3d81194 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -742,14 +742,14 @@ START_TEST(capture) hDsound = LoadLibrary("dsound.dll"); if (!hDsound) { - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); return; } pDirectSoundCaptureCreate = (void*)GetProcAddress(hDsound, "DirectSoundCaptureCreate"); pDirectSoundCaptureEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundCaptureEnumerateA"); if (!pDirectSoundCaptureCreate || !pDirectSoundCaptureEnumerateA) { - skip("capture test skipped\n"); + skip("DirectSoundCapture{Create,Enumerate} missing - skipping all tests\n"); return; } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 86099bf..dc25f25 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1331,7 +1331,7 @@ START_TEST(ds3d) FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 41de792..e90057d 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1151,12 +1151,12 @@ START_TEST(ds3d8) if (pDirectSoundCreate8) ds3d8_tests(); else - skip("ds3d8 test skipped\n"); + skip("DirectSoundCreate8 missing - skipping all tests\n"); FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 894079d..f86464b 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1605,7 +1605,7 @@ START_TEST(dsound) FreeLibrary(hDsound); } else - win_skip("dsound.dll not found!\n"); + win_skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index d4f07ff..ae2f7a7 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1189,12 +1189,12 @@ START_TEST(dsound8) test_first_device(); } else - skip("dsound8 test skipped\n"); + skip("DirectSoundCreate8 missing - skipping all tests\n"); FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 0f8d6d1..055bf09 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -238,12 +238,12 @@ START_TEST(duplex) if (pDirectSoundFullDuplexCreate) IDirectSoundFullDuplex_tests(); else - skip("duplex test skipped\n"); + skip("DirectSoundFullDuplexCreate missing - skipping all tests\n"); FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index fb902a4..e85924d 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -743,7 +743,7 @@ START_TEST(propset) FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); }

1 0

Rico Schüller : d3dx9/tests: Check all elements in the effect parameter value test.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: c178b61bb9ae777d4ffaaba4930cdb179897ee7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c178b61bb9ae777d4ffaaba49… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Aug 8 17:02:13 2012 +0200 d3dx9/tests: Check all elements in the effect parameter value test. --- dlls/d3dx9_36/tests/effect.c | 199 ++++++++++++++++++++++------------------- 1 files changed, 107 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c178b61bb9ae777d4ffaa…

1 0

Francois Gouget : winmm: MMDRV_GetRelated() is not used anymore so remove it.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: eabbe5ab58f19b2f1910201c64e9873e7f004649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eabbe5ab58f19b2f1910201c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 13 00:14:35 2012 +0200 winmm: MMDRV_GetRelated() is not used anymore so remove it. --- dlls/winmm/lolvldrv.c | 18 ------------------ dlls/winmm/winemm.h | 1 - 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 7081a86..f387323 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -282,24 +282,6 @@ LPWINE_MLD MMDRV_Get(HANDLE _hndl, UINT type, BOOL bCanBeID) } /************************************************************************** - * MMDRV_GetRelated [internal] - */ -LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, - BOOL bSrcCanBeID, UINT dstType) -{ - LPWINE_MLD mld; - TRACE("(%p, %04x, %c, %04x)\n", - hndl, srcType, bSrcCanBeID ? 'Y' : 'N', dstType); - - if ((mld = MMDRV_Get(hndl, srcType, bSrcCanBeID)) != NULL) { - WINE_MM_DRIVER_PART* part = &MMDrvs[mld->mmdIndex].parts[dstType]; - if (part->nIDMin < part->nIDMax) - return MMDRV_GetByID(part->nIDMin, dstType); - } - return NULL; -} - -/************************************************************************** * MMDRV_PhysicalFeatures [internal] */ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 93c2627..d7bab0f 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -140,7 +140,6 @@ void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld) DECLSPEC_HIDDEN; DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2) DECLSPEC_HIDDEN; DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg) DECLSPEC_HIDDEN; LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID) DECLSPEC_HIDDEN; -LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT dstTyped) DECLSPEC_HIDDEN; DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN;

1 0

Francois Gouget : dsound/tests: Trace the number of tested DirectSound drivers.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 4d24132ea4a6887c39f84935702af2c274f2a7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d24132ea4a6887c39f849357… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 13 00:16:13 2012 +0200 dsound/tests: Trace the number of tested DirectSound drivers. --- dlls/dsound/tests/ds3d.c | 4 ++++ dlls/dsound/tests/ds3d8.c | 4 ++++ dlls/dsound/tests/propset.c | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index dc25f25..36e59c9 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1258,11 +1258,14 @@ return DSERR_GENERIC; return rc; } +static unsigned driver_count = 0; + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { HRESULT rc; trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); + driver_count++; rc = test_for_driver(lpGuid); if (rc == DSERR_NODRIVER) { @@ -1309,6 +1312,7 @@ static void ds3d_tests(void) HRESULT rc; rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(ds3d) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index e90057d..c432d35 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1081,11 +1081,14 @@ return DSERR_GENERIC; return rc; } +static unsigned driver_count = 0; + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { HRESULT rc; trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); + driver_count++; rc = test_for_driver8(lpGuid); if (rc == DSERR_NODRIVER) { @@ -1132,6 +1135,7 @@ static void ds3d8_tests(void) HRESULT rc; rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(ds3d8) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index e85924d..6324a3f 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -553,6 +553,8 @@ static void propset_private_tests(void) IKsPropertySet_Release(pps); } +static unsigned driver_count = 0; + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { @@ -564,6 +566,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, int ref; trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); + driver_count++; rc=pDirectSoundCreate(lpGuid,&dso,NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, @@ -710,6 +713,7 @@ static void propset_buffer_tests(void) HRESULT rc; rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(propset)

1 0

Eric Pouech : msacm32: Convert acmFormatChoose internals to Unicode, implement acmFormatChoose[AW] on top of it.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 22789aa30ef94fed0f74f8623e1088716ec3ce14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22789aa30ef94fed0f74f8623… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Aug 12 10:03:41 2012 +0200 msacm32: Convert acmFormatChoose internals to Unicode, implement acmFormatChoose[AW] on top of it. --- dlls/msacm32/format.c | 181 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 125 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22789aa30ef94fed0f74f…

1 0