October 2012 - Wine-commits

Jacek Caban : mshtml: Added IHTMLScriptElement::put_src tests.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: bfd25b4f50ade3ce56eabdfc3bc6617f7dc2bc52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd25b4f50ade3ce56eabdfc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:10:11 2012 +0200 mshtml: Added IHTMLScriptElement::put_src tests. --- dlls/mshtml/tests/exectest.html | 78 +++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/externscr.js | 1 + dlls/mshtml/tests/rsrc.rc | 3 + 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index ad94f42..e1e73f6 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -4,26 +4,82 @@ Script execution test <div id="b1"></div> <div id="b2"></div> <div id="b3"></div> +<script id="emptyscript"></script> <script> function ok(b, msg) { return external.ok(b, msg); } var executed = false; -var len = document.getElementsByTagName('div').length; -ok(len === 3, "init length = " + len); +var extern_cnt = 0; -document.write("<script>" - + "var len = document.getElementsByTagName('div').length;" - + "ok(len === 3, 'unexpected length ' + len);" - + "executed = true;" - + "<" + "/script>"); +function testWriteScript() { + var len = document.getElementsByTagName('div').length; + ok(len === 3, "init length = " + len); -len = document.getElementsByTagName('script').length; -ok(len === 2, "script col length = " + len); -ok(executed, "written script not executed"); + document.write("<script>" + + "var len = document.getElementsByTagName('div').length;" + + "ok(len === 3, 'unexpected length ' + len);" + + "executed = true;" + + "<" + "/script>"); -external.reportSuccess(); + len = document.getElementsByTagName('script').length; + ok(len === 3, "script col length = " + len); + ok(executed, "written script not executed"); +} + +function testPutSrc() { + var elem = document.getElementById("emptyscript"); + + ok(extern_cnt === 0, "extern_cnt = " + extern_cnt + " expected 0"); + elem.src = "externscr.js"; + ok(extern_cnt === 0, "extern_cnt = " + extern_cnt + " expected 0"); +} + +try { + testWriteScript(); + testPutSrc(); +}catch(e) { + ok(false, "Got an exception"); +} + +function testPutSrc2() { + var elem, elem2; + + elem = document.createElement("script"); + elem.src = "externscr.js"; + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt + " expected 1"); + document.body.appendChild(elem); + ok(extern_cnt === 2, "extern_cnt = " + extern_cnt + " expected 2"); + + elem = document.createElement("script"); + document.body.appendChild(elem); + ok(extern_cnt === 2, "extern_cnt = " + extern_cnt + " expected 2"); + elem.src = "externscr.js"; + ok(extern_cnt === 3, "extern_cnt = " + extern_cnt + " expected 3"); + + elem2 = document.createElement("div"); + elem = document.createElement("script"); + elem.src = "externscr.js"; + ok(extern_cnt === 3, "extern_cnt = " + extern_cnt + " expected 3"); + elem2.appendChild(elem); + document.body.appendChild(elem2); + ok(extern_cnt === 4, "extern_cnt = " + extern_cnt + " expected 4"); +} + +document.body.onload = function() { + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); + try { + testPutSrc2(); + }catch(e) { + ok(false, "got an exception"); + } + + external.reportSuccess(); +} +</script> +<script> + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); </script> <div id="a1"></div> <div id="a2"></div> diff --git a/dlls/mshtml/tests/externscr.js b/dlls/mshtml/tests/externscr.js new file mode 100644 index 0000000..5861363 --- /dev/null +++ b/dlls/mshtml/tests/externscr.js @@ -0,0 +1 @@ +extern_cnt++; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 2b91edf..49aecdf 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -28,5 +28,8 @@ vbtest.html HTML "vbtest.html" /* @makedep: events.html */ events.html HTML "events.html" +/* @makedep: externscr.js */ +externscr.js HTML "externscr.js" + /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb

1 0

Jacek Caban : mshtml: Fixed tests on old IEs.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 282b2608c4352928377e9d461e410b5900e08f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282b2608c4352928377e9d461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:10:29 2012 +0200 mshtml: Fixed tests on old IEs. --- dlls/mshtml/tests/script.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index ddf3613..2f8b8ec 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2091,6 +2091,10 @@ static void test_ui(void) HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); + if(hres == E_NOINTERFACE) { + win_skip("IActiveScriptSiteUIControl not supported\n"); + return; + } ok(hres == S_OK, "Could not get IActiveScriptSiteUIControl: %08x\n", hres); hres = IActiveScriptSiteUIControl_GetUIBehavior(ui_control, SCRIPTUICITEM_MSGBOX, &uic_handling);

1 0

Matteo Bruni : wined3d: Split GPU vendor and GL vendor handling in GPU recognition.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: fe81c61804fdf307e26722b0bad61d3eb4843142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe81c61804fdf307e26722b0b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:32:59 2012 +0200 wined3d: Split GPU vendor and GL vendor handling in GPU recognition. --- dlls/wined3d/directx.c | 190 +++++++++++++++++++++++++++-------------------- 1 files changed, 109 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe81c61804fdf307e2672…

1 0

Matteo Bruni : wined3d: Improve a Nvidia GPU recognition fallback.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 37ff45cca2210d03355b881e62688e1ac45a7fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ff45cca2210d03355b881e6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:00 2012 +0200 wined3d: Improve a Nvidia GPU recognition fallback. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4406d70..3eb5eb0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2136,7 +2136,7 @@ static enum wined3d_pci_device select_card_fallback_nvidia(const struct wined3d_ if (d3d_level >= 10) return CARD_NVIDIA_GEFORCE_8800GTX; if (d3d_level >= 9 && gl_info->supported[NV_VERTEX_PROGRAM3]) - return CARD_NVIDIA_GEFORCE_6200; + return CARD_NVIDIA_GEFORCE_6800; if (d3d_level >= 9) return CARD_NVIDIA_GEFORCEFX_5800; if (d3d_level >= 8)

1 0

Matteo Bruni : wined3d: Add a D3D10-level fallback for Intel GPU recognition.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 4e57dd0cdea497d3e3ec7970fa338c0c87da0a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e57dd0cdea497d3e3ec7970f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:01 2012 +0200 wined3d: Add a D3D10-level fallback for Intel GPU recognition. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3eb5eb0..686cead 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2164,6 +2164,9 @@ static enum wined3d_pci_device select_card_fallback_amd(const struct wined3d_gl_ static enum wined3d_pci_device select_card_fallback_intel(const struct wined3d_gl_info *gl_info) { + UINT d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 10) + return CARD_INTEL_G45; return CARD_INTEL_915G; }

1 0

Matteo Bruni : wined3d: Provide a better fallback for D3D10 AMD GPUs.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 6a9df3e75765919afdfedd7c842bbbfa0e14faa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9df3e75765919afdfedd7c8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:02 2012 +0200 wined3d: Provide a better fallback for D3D10 AMD GPUs. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 686cead..4c8d391 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2152,7 +2152,7 @@ static enum wined3d_pci_device select_card_fallback_amd(const struct wined3d_gl_ { UINT d3d_level = d3d_level_from_gl_info(gl_info); if (d3d_level >= 10) - return CARD_AMD_RADEON_HD2600; + return CARD_AMD_RADEON_HD2900; if (d3d_level >= 9) return CARD_AMD_RADEON_9500; if (d3d_level >= 8)

1 0

Matteo Bruni : wined3d: Recognize AMD Radeon HD 5000 series GPUs on recent binary drivers.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 29c336916c9e6334d69b5f93de8b1a39595916f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c336916c9e6334d69b5f93d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:03 2012 +0200 wined3d: Recognize AMD Radeon HD 5000 series GPUs on recent binary drivers. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4c8d391..b161564 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1729,6 +1729,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 5570", CARD_AMD_RADEON_HD5600}, /* Radeon EG REDWOOD PRO mapped to HD5600 series */ {"HD 5550", CARD_AMD_RADEON_HD5600}, /* Radeon EG REDWOOD LE mapped to HD5600 series */ {"HD 5450", CARD_AMD_RADEON_HD5400}, /* Radeon EG CEDAR PRO */ + {"HD 5000", CARD_AMD_RADEON_HD5600}, /* Defaulting to HD 5600 */ /* R700 */ {"HD 4890", CARD_AMD_RADEON_HD4800}, /* Radeon RV790 */ {"HD 4870", CARD_AMD_RADEON_HD4800}, /* Radeon RV770 */

1 0

Matteo Bruni : wined3d: Add new Radeon HD 6670 GL renderer string.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 3c11d8f331f3838dbcb59ba60df76b12fcd24245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c11d8f331f3838dbcb59ba60… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:04 2012 +0200 wined3d: Add new Radeon HD 6670 GL renderer string. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b161564..7213d05 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1710,6 +1710,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 6770M",CARD_AMD_RADEON_HD6600M}, {"HD 6750M",CARD_AMD_RADEON_HD6600M}, {"HD 6700", CARD_AMD_RADEON_HD6700}, + {"HD 6670", CARD_AMD_RADEON_HD6600}, {"HD 6630M",CARD_AMD_RADEON_HD6600M}, {"HD 6600M",CARD_AMD_RADEON_HD6600M}, {"HD 6600", CARD_AMD_RADEON_HD6600},

1 0

Christian Costa : amstream: Specifying a stream object in params is not yet supported.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 7d128ea8993c708d5bb6a4a31f9bc1b6635287d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d128ea8993c708d5bb6a4a31… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 16 20:12:19 2012 +0200 amstream: Specifying a stream object in params is not yet supported. --- dlls/amstream/amstream.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 833d360..94066a1 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -331,7 +331,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* ifa return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* pStreamObject, const MSPID* PurposeId, +static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* stream_object, const MSPID* PurposeId, DWORD dwFlags, IMediaStream** ppNewStream) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); @@ -339,11 +339,14 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream IMediaStream* pStream; IMediaStream** pNewStreams; - TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); + TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, stream_object, debugstr_guid(PurposeId), dwFlags, ppNewStream); if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; + if (stream_object) + FIXME("Specifying a stream object in params is not yet supported\n"); + if (dwFlags & AMMSF_ADDDEFAULTRENDERER) { if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo))

1 0

Daniel Jelinski : regedit: Disallow editing root key names.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 003622c015298d2c4fcbdf63ccc62ca036acd0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=003622c015298d2c4fcbdf63c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Oct 16 20:14:52 2012 +0200 regedit: Disallow editing root key names. --- programs/regedit/childwnd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 1ff7a90..6dc7d0c 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -405,6 +405,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); break; } + case TVN_BEGINLABELEDITW: { + HKEY hRootKey; + LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + if (!path || !*path) return 1; + return 0; + } case TVN_ENDLABELEDITW: { HKEY hRootKey; LPNMTVDISPINFOW dispInfo = (LPNMTVDISPINFOW)lParam;

1 0