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

Jacek Caban : mshtml: Added VBScript in HTML tests.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: d32ee8e4a01ef2d75377763713fa465da8d8ea8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32ee8e4a01ef2d7537776371… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:04:18 2012 +0200 mshtml: Added VBScript in HTML tests. --- dlls/mshtml/tests/rsrc.rc | 3 +++ dlls/mshtml/tests/script.c | 19 +++++++++++++++---- dlls/mshtml/tests/vbtest.html | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index d6c0ffd..fb74c45 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -21,3 +21,6 @@ exectest.html HTML "exectest.html" /* @makedep: jstest.html */ jstest.html HTML "jstest.html" + +/* @makedep: vbtest.html */ +vbtest.html HTML "vbtest.html" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 0457029..dcad5f7 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -594,7 +594,9 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { - case DISPID_EXTERNAL_OK: + case DISPID_EXTERNAL_OK: { + VARIANT *b, *m; + ok(wFlags == INVOKE_FUNC || wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); @@ -603,11 +605,19 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); ok(pei != NULL, "pei == NULL\n"); - ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); - ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); - ok(V_BOOL(pdp->rgvarg+1), "%s\n", wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + m = pdp->rgvarg; + if(V_VT(m) == (VT_BYREF|VT_VARIANT)) + m = V_BYREF(m); + ok(V_VT(m) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + + b = pdp->rgvarg+1; + if(V_VT(b) == (VT_BYREF|VT_VARIANT)) + b = V_BYREF(b); + ok(V_VT(b) == VT_BOOL, "V_VT(b) = %d\n", V_VT(b)); + ok(V_BOOL(b), "%s\n", wine_dbgstr_w(V_BSTR(m))); return S_OK; + } case DISPID_EXTERNAL_TRACE: ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); @@ -2732,6 +2742,7 @@ static void run_js_tests(void) { run_js_script("jstest.html"); run_js_script("exectest.html"); + run_js_script("vbtest.html"); } static BOOL init_registry(BOOL init) diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html new file mode 100644 index 0000000..9addc93 --- /dev/null +++ b/dlls/mshtml/tests/vbtest.html @@ -0,0 +1,34 @@ +<html> +<head> +<script type="text/vbscript"> +Dim counter + +counter = 1 + +Sub ok(b,m) + Call external.ok(b,m) +End Sub +</script> +<script> +' Verifies that we're in VBScript although there is no type specified +If true then counter = counter+1 +</script> +<script type="text/javascript"> +// We're in javascript +</script> +<script type="text/vbscript"> +' And back to VBScript +If true then counter = counter+1 + +Sub runTest() + Call ok(counter = 3, "counter = " & counter) + Call external.reportSuccess() +End Sub +</script> +</script> +<body> +<script> +runTest() +</script> +</body> +</html>

1 0

Jacek Caban : vbscript: Added IActiveScriptParseProcedure2 stub implementation.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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

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

13 Aug '12

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

Aric Stewart : usp10: Use cached values in GPOS functions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 7819ce61b51f53e0819ee2f335bfee5ff82a5562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7819ce61b51f53e0819ee2f33… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 31 08:50:06 2012 -0500 usp10: Use cached values in GPOS functions. --- dlls/usp10/shape.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1ef6039..3d6b303 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3285,9 +3285,6 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps const TEXTRANGE_PROPERTIES *rpRangeProperties; int i; INT dirL; - LPOUTLINETEXTMETRICW lpotm; - LOGFONTW lf; - HFONT hfont; rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange; @@ -3296,15 +3293,9 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps load_ot_tables(hdc, psc); - if (!psc->GPOS_Table) + if (!psc->GPOS_Table || !psc->otm) return; - i = GetOutlineTextMetricsW( hdc, 0, NULL); - lpotm = HeapAlloc(GetProcessHeap(),0,i); - GetOutlineTextMetricsW( hdc, i, lpotm); - hfont = GetCurrentObject(hdc, OBJ_FONT); - GetObjectW(hfont, sizeof(lf), &lf); - if (!psa->fLogicalOrder && psa->fRTL) dirL = -1; else @@ -3320,7 +3311,7 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps if (!feature) continue; - GPOS_apply_feature(lpotm, &lf, piAdvance, psc->GPOS_Table, feature, pwGlyphs, dirL, cGlyphs, pGoffset); + GPOS_apply_feature(psc->otm, &psc->lf, piAdvance, psc->GPOS_Table, feature, pwGlyphs, dirL, cGlyphs, pGoffset); } } }

1 0

Michael Stefaniuc : gdiplus: Remove unreachable break after return (Smatch) .
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 60bef1409401ea11a71c8b4bdb4b92688ae516ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bef1409401ea11a71c8b4bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 1 01:14:15 2012 +0200 gdiplus: Remove unreachable break after return (Smatch). --- dlls/gdiplus/gdiplus.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 2599c58..ed2dcae 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -379,7 +379,6 @@ REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) return pixels * point_per_inch / dpi; case UnitInch: return pixels / dpi; - break; case UnitDocument: return pixels * 300.0 / dpi; case UnitMillimeter:

1 0

Michael Stefaniuc : ole32: Remove superfluous NULL pointer check before free (Smatch).
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 55d811351ab1c7212b513d21995867db61fc65d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d811351ab1c7212b513d219… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 1 01:14:56 2012 +0200 ole32: Remove superfluous NULL pointer check before free (Smatch). --- dlls/ole32/ole2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 74fb43e..b857a3c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2953,8 +2953,7 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ CoTaskMemFree(pvar->u.blob.pBlobData); break; case VT_BSTR: - if (pvar->u.bstrVal) - PropSysFreeString(pvar->u.bstrVal); + PropSysFreeString(pvar->u.bstrVal); break; case VT_CF: if (pvar->u.pclipdata)

1 0

Detlef Riekenberg : kernel32/tests: Fix test failures on win7.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 9aacf4ce6fe240dcfb41f09cd959af2c0e52f66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aacf4ce6fe240dcfb41f09cd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 3 05:12:59 2012 +0200 kernel32/tests: Fix test failures on win7. --- dlls/kernel32/tests/debugger.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 2094190..22f7190 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -287,6 +287,13 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) } ret=RegSetValueExA(hkey, "auto", 0, REG_SZ, (BYTE*)"1", 2); + if (ret == ERROR_ACCESS_DENIED) + { + skip_crash_and_debug = TRUE; + skip("No write access to change the debugger\n"); + return; + } + ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%d\n", ret); get_file_name(dbglog);

1 0

Detlef Riekenberg : mpr/tests: Handle result from the AppV virtual drive.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: fc4b2f6ceca61ca7738b81f6e843509d79977314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4b2f6ceca61ca7738b81f6e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 3 19:16:35 2012 +0200 mpr/tests: Handle result from the AppV virtual drive. --- dlls/mpr/tests/mpr.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index d54d80d..8ccce78 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -42,7 +42,11 @@ static void test_WNetGetUniversalName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + /* WN_NO_NET_OR_BAD_PATH (DRIVE_FIXED) returned from the virtual drive (usual Q:) + created by the microsoft application virtualization client */ + ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), + "WNetGetUniversalNameA(%s, ...) returned %u (drive_type: %u)\n", + driveA, ret, drive_type); ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); @@ -53,7 +57,9 @@ static void test_WNetGetUniversalName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret); + ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), + "WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n", + wine_dbgstr_w(driveW), ret, drive_type); ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); }

1 0

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

13 Aug '12

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

Eric Pouech : msacm32: In format chosse dialog, get rid of static variables , and store information as a property of dialog.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 03ab4bea9c72972a9e54eff76e3a6cadf43ca6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ab4bea9c72972a9e54eff76… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Aug 12 10:03:35 2012 +0200 msacm32: In format chosse dialog, get rid of static variables, and store information as a property of dialog. --- dlls/msacm32/format.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 9866139..f117994 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm); -static PACMFORMATCHOOSEA afc; - struct MSACM_FillFormatData { HWND hWnd; #define WINE_ACMFF_TAG 0 @@ -195,20 +193,24 @@ static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEA afc) return affd.ret; } +static const char* fmt_prop = "acmprop"; + static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam) + WPARAM wParam, LPARAM lParam) { + PACMFORMATCHOOSEA afc = (PACMFORMATCHOOSEA)GetPropA(hWnd, fmt_prop); - TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam ); + TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: afc = (PACMFORMATCHOOSEA)lParam; + SetPropA(hWnd, fmt_prop, (HANDLE)afc); MSACM_FillFormatTags(hWnd); MSACM_FillFormat(hWnd); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0) - FIXME("Unsupported style %08x\n", ((PACMFORMATCHOOSEA)lParam)->fdwStyle); + FIXME("Unsupported style %08x\n", afc->fdwStyle); if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); return TRUE;

1 0