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

Józef Kucia : d3dx9/tests: Add basic tests for ID3DXRenderToEnvMap.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 5a99be321bbffb168c0403de1aa472aacd7db2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a99be321bbffb168c0403de1… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:40 2012 +0200 d3dx9/tests: Add basic tests for ID3DXRenderToEnvMap. --- dlls/d3dx9_36/tests/core.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index eb1e769..92c114a 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1084,6 +1084,48 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) ID3DXRenderToEnvMap_Release(render); } +static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) +{ + HRESULT hr; + ID3DXRenderToEnvMap *render; + + hr = D3DXCreateRenderToEnvMap(device, 256, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); + if (SUCCEEDED(hr)) + { + ULONG ref_count; + IDirect3DDevice9 *out_device; + + hr = ID3DXRenderToEnvMap_GetDesc(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::GetDesc returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_GetDevice(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::GetDevice returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + ref_count = get_ref((IUnknown *)device); + hr = ID3DXRenderToEnvMap_GetDevice(render, &out_device); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::GetDevice returned %#x, expected %#x\n", hr, D3D_OK); + ok(out_device == device, "ID3DXRenderToEnvMap::GetDevice returned different device\n"); + check_release((IUnknown *)device, ref_count); + + hr = ID3DXRenderToEnvMap_End(render, D3DX_FILTER_NONE); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::End returned %#x, expected %#x\n", hr, D3D_OK); + + hr = ID3DXRenderToEnvMap_BeginCube(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginCube returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginHemisphere(render, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginHemisphere returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginParabolic(render, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginParabolic returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginSphere(render, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginSphere returned %#x, exected %#x\n", hr, D3DERR_INVALIDCALL); + + check_release((IUnknown *)render, 0); + } else skip("Failed to create ID3DXRenderToEnvMap\n"); +} + START_TEST(core) { HWND wnd; @@ -1121,6 +1163,7 @@ START_TEST(core) test_D3DXCreateRenderToSurface(device); test_ID3DXRenderToSurface(device); test_D3DXCreateRenderToEnvMap(device); + test_ID3DXRenderToEnvMap(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

Jacek Caban : ole32: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 153b94b3c5f71b4e8bfcf1d4344c14e27b070ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153b94b3c5f71b4e8bfcf1d43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:40:33 2012 +0200 ole32: Use proper helpers for iface calls. --- dlls/ole32/antimoniker.c | 5 ++--- dlls/ole32/classmoniker.c | 5 ++--- dlls/ole32/comcat.c | 2 +- dlls/ole32/compobj.c | 8 ++++---- dlls/ole32/compositemoniker.c | 5 ++--- dlls/ole32/datacache.c | 2 +- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/filemoniker.c | 2 +- dlls/ole32/ftmarshal.c | 2 +- dlls/ole32/ifs.c | 2 +- dlls/ole32/itemmoniker.c | 5 ++--- dlls/ole32/marshal.c | 4 ++-- dlls/ole32/moniker.c | 4 ++-- dlls/ole32/ole2.c | 9 +++------ dlls/ole32/oleobj.c | 2 +- dlls/ole32/pointermoniker.c | 2 +- dlls/ole32/rpc.c | 4 ++-- dlls/ole32/stubmanager.c | 2 +- 18 files changed, 30 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=153b94b3c5f71b4e8bfcf…

1 0

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

Aug. 13, 2012

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

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

Aug. 13, 2012

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

Jacek Caban : mshtml: Fixed DISPATCH_PROPERTYGET|DISPATCH_METHOD support in invoke_builtin_prop.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 156e212715991e52d7d5fc3e28ecb537ec9abcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=156e212715991e52d7d5fc3e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:03:13 2012 +0200 mshtml: Fixed DISPATCH_PROPERTYGET|DISPATCH_METHOD support in invoke_builtin_prop. --- dlls/mshtml/dispex.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index b2f5b81..a3ac623 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -985,9 +985,14 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD return E_FAIL; } - hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); - - IDispatch_Release(V_DISPATCH(&v)); + if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); + IDispatch_Release(V_DISPATCH(&v)); + }else if(res) { + *res = v; + }else { + IDispatch_Release(V_DISPATCH(&v)); + } } }

1 0

Jacek Caban : mshtml: Added VBScript in HTML tests.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

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

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

Aug. 13, 2012

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

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

Aug. 13, 2012

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

Jacek Caban : mshtml: Test contentWindow interfaces of frame and iframe elements.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 0ec75b1a5f4dd71f5ae62f20a634e5661d975eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec75b1a5f4dd71f5ae62f20a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:03:02 2012 +0200 mshtml: Test contentWindow interfaces of frame and iframe elements. --- dlls/mshtml/tests/dom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 561af14..760580e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4975,6 +4975,7 @@ static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) HRESULT hres; content_window = get_frame_content_window(frame_elem); + test_ifaces((IUnknown*)content_window, window_iids); window_doc = get_window_doc(content_window); IHTMLWindow2_Release(content_window); @@ -5025,6 +5026,7 @@ static void test_iframe_elem(IHTMLElement *elem) test_framebase((IUnknown*)elem); content_window = get_frame_content_window((IUnknown*)elem); + test_ifaces((IUnknown*)content_window, window_iids); test_window_length(content_window, 0); content_doc = get_window_doc(content_window);

1 0

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

Aug. 13, 2012

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