January 2015 - Wine-commits

Charles Davis : msvcrt: Support 64-bit platforms that don' t have finitef or isnanf.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 7ef720f1840ea817d8a9bcc8da2843ec66a510fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef720f1840ea817d8a9bcc8d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 22 23:30:57 2015 -0700 msvcrt: Support 64-bit platforms that don't have finitef or isnanf. --- configure | 2 ++ configure.ac | 2 ++ dlls/msvcrt/math.c | 12 ++++++++++++ include/config.h.in | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/configure b/configure index c0aa93e..b6660bd 100755 --- a/configure +++ b/configure @@ -14671,6 +14671,7 @@ for ac_func in \ dlopen \ epoll_create \ ffs \ + finitef \ fnmatch \ fork \ fpclass \ @@ -14687,6 +14688,7 @@ for ac_func in \ gettimeofday \ getuid \ if_nameindex \ + isnanf \ kqueue \ lstat \ memmove \ diff --git a/configure.ac b/configure.ac index ab8945a..b40fde4 100644 --- a/configure.ac +++ b/configure.ac @@ -2045,6 +2045,7 @@ AC_CHECK_FUNCS(\ dlopen \ epoll_create \ ffs \ + finitef \ fnmatch \ fork \ fpclass \ @@ -2061,6 +2062,7 @@ AC_CHECK_FUNCS(\ gettimeofday \ getuid \ if_nameindex \ + isnanf \ kqueue \ lstat \ memmove \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 284924a..acac35d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -34,6 +34,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +#ifndef HAVE_FINITEF +#define finitef(x) isfinite(x) +#endif + +#ifndef HAVE_ISNANF +#ifdef HAVE_ISNAN +#define isnanf(x) isnan(x) +#else +#define isnanf(x) 0 +#endif +#endif + #ifndef signbit #define signbit(x) 0 #endif diff --git a/include/config.h.in b/include/config.h.in index a8ae6c5..4d7c7ac 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -123,6 +123,9 @@ /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS +/* Define to 1 if you have the `finitef' function. */ +#undef HAVE_FINITEF + /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H @@ -279,6 +282,9 @@ /* Define to 1 if you have the `isnan' function. */ #undef HAVE_ISNAN +/* Define to 1 if you have the `isnanf' function. */ +#undef HAVE_ISNANF + /* Define to 1 if you have the <jpeglib.h> header file. */ #undef HAVE_JPEGLIB_H

1 0

Matteo Bruni : wined3d: Properly initialize the last two components of R16G16_SINT attributes.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 584892b6923a8b3d772435c1982dcc9981a13603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584892b6923a8b3d772435c19… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:41 2015 +0100 wined3d: Properly initialize the last two components of R16G16_SINT attributes. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 12b03f6..4812143 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -377,7 +377,7 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, break; case WINED3DFMT_R16G16_SINT: - GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); + GL_EXTCALL(glVertexAttrib2svARB(index, ptr)); break; case WINED3DFMT_R16G16B16A16_SINT: GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c204ca..7cac2dc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4297,7 +4297,7 @@ static void load_numbered_arrays(struct wined3d_context *context, break; case WINED3DFMT_R16G16_SINT: - GL_EXTCALL(glVertexAttrib4svARB(i, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib2svARB(i, (const GLshort *)ptr)); break; case WINED3DFMT_R16G16B16A16_SINT: GL_EXTCALL(glVertexAttrib4svARB(i, (const GLshort *)ptr));

1 0

Matteo Bruni : wined3d: Use the core version of GL vertex attribute functions where possible.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: e192939652f396292283f05034b10b6c2d13d334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e192939652f396292283f0503… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:42 2015 +0100 wined3d: Use the core version of GL vertex attribute functions where possible. --- dlls/wined3d/directx.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 30 +++++++++++++++--------------- dlls/wined3d/state.c | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 73 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e192939652f396292283f…

1 0

Matteo Bruni : wined3d: Use the core version of the shader object functions.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: d360a51f3cb01d277b7438e5e04ce41f1228903b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d360a51f3cb01d277b7438e5e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:43 2015 +0100 wined3d: Use the core version of the shader object functions. --- dlls/wined3d/directx.c | 93 +++++++++- dlls/wined3d/glsl_shader.c | 454 ++++++++++++++++++++++----------------------- 2 files changed, 319 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d360a51f3cb01d277b743…

1 0

Michael Stefaniuc : winex11.drv: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: f256e1476c9ce9262ff252107f72782cab84f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f256e1476c9ce9262ff252107… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 11:13:17 2015 +0100 winex11.drv: Remove an unused assignment (PVS-Studio). --- dlls/winex11.drv/xrandr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e9670c3..58e66d6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -163,7 +163,7 @@ static LONG xrandr10_set_current_mode( int mode ) root = DefaultRootWindow( gdi_display ); sc = pXRRGetScreenInfo (gdi_display, root); - size = pXRRConfigCurrentConfiguration (sc, &rot); + pXRRConfigCurrentConfiguration (sc, &rot); mode = mode % xrandr_mode_count; TRACE("Changing Resolution to %dx%d @%d Hz\n",

1 0

Michael Stefaniuc : wininet: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: b32d93a10bafa43609c6db0f06a5049dca955984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32d93a10bafa43609c6db0f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 11:13:57 2015 +0100 wininet: Remove an unused assignment (PVS-Studio). --- dlls/wininet/cookie.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index d2fbec3..bb1a914 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -367,7 +367,6 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) *pend = 0; data = heap_strdupAtoW(pbeg); - pbeg = pend+1; pbeg = strchr(pend+1, '\n'); if(!pbeg) break;

1 0

Jacek Caban : secur32/tests: Don' t call InitializeSecurityContext on an uninitialized buffer.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 48ea8a1cb488c3df1c7b2a249b4c03166fdcf29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ea8a1cb488c3df1c7b2a249… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 14:23:38 2015 +0100 secur32/tests: Don't call InitializeSecurityContext on an uninitialized buffer. Also documents failure on an invalid buffer. --- dlls/secur32/tests/schannel.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 97fa0bc..585ba21 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -700,6 +700,19 @@ static void test_communication(void) buffers[1].cBuffers = 1; buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; buffers[0].pBuffers[0].cbBuffer = 1; + memset(buffers[1].pBuffers[0].pvBuffer, 0xfa, buf_size); + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); +todo_wine + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); +todo_wine + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + + buffers[1].cBuffers = 1; + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pBuffers[0].cbBuffer = 1; + memset(buffers[1].pBuffers[0].pvBuffer, 0, buf_size); status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); @@ -707,6 +720,7 @@ static void test_communication(void) todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + buffers[0].pBuffers[0].cbBuffer = 0; status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);

1 0

Jacek Caban : mshtml: Improved IOleCommandTarget:: QueryStatus implementation.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 23d74d3b73bc610bf503040ef7d4c66906c7c65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d74d3b73bc610bf503040ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 20:04:44 2015 +0100 mshtml: Improved IOleCommandTarget::QueryStatus implementation. --- dlls/mshtml/olecmd.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index c45e9c9..9417311 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -790,18 +790,22 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { HTMLDocument *This = impl_from_IOleCommandTarget(iface); - HRESULT hres = S_OK, hr; + HRESULT hres; TRACE("(%p)->(%s %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); + if(pCmdText) + FIXME("Unsupported pCmdText\n"); + if(!cCmds) + return S_OK; + if(!pguidCmdGroup) { ULONG i; for(i=0; i<cCmds; i++) { - if(prgCmds[i].cmdID<OLECMDID_OPEN || prgCmds[i].cmdID>OLECMDID_GETPRINTTEMPLATE) { + if(prgCmds[i].cmdID < OLECMDID_OPEN || prgCmds[i].cmdID >= sizeof(exec_table)/sizeof(*exec_table)) { WARN("Unsupported cmdID = %d\n", prgCmds[i].cmdID); prgCmds[i].cmdf = 0; - hres = OLECMDERR_E_NOTSUPPORTED; }else { if(prgCmds[i].cmdID == OLECMDID_OPEN || prgCmds[i].cmdID == OLECMDID_NEW) { IOleCommandTarget *cmdtrg = NULL; @@ -809,14 +813,14 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con prgCmds[i].cmdf = OLECMDF_SUPPORTED; if(This->doc_obj->client) { - hr = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, + hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hres)) { olecmd.cmdID = prgCmds[i].cmdID; olecmd.cmdf = 0; - hr = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 1, &olecmd, NULL); - if(SUCCEEDED(hr) && olecmd.cmdf) + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 1, &olecmd, NULL); + if(SUCCEEDED(hres) && olecmd.cmdf) prgCmds[i].cmdf = olecmd.cmdf; } }else { @@ -826,33 +830,28 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con prgCmds[i].cmdf = exec_table[prgCmds[i].cmdID].cmdf; TRACE("cmdID = %d returning %x\n", prgCmds[i].cmdID, prgCmds[i].cmdf); } - hres = S_OK; } } - if(pCmdText) - FIXME("Set pCmdText\n"); - }else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + return (prgCmds[cCmds-1].cmdf & OLECMDF_SUPPORTED) ? S_OK : OLECMDERR_E_NOTSUPPORTED; + } + + if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { ULONG i; for(i=0; i<cCmds; i++) { - HRESULT hres = query_from_table(This, base_cmds, prgCmds+i); + hres = query_from_table(This, base_cmds, prgCmds+i); if(hres == OLECMDERR_E_NOTSUPPORTED) hres = query_from_table(This, editmode_cmds, prgCmds+i); if(hres == OLECMDERR_E_NOTSUPPORTED) FIXME("CGID_MSHTML: unsupported cmdID %d\n", prgCmds[i].cmdID); } - hres = prgCmds[i-1].cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED; - - if(pCmdText) - FIXME("Set pCmdText\n"); - }else { - FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); - hres = OLECMDERR_E_UNKNOWNGROUP; + return (prgCmds[cCmds-1].cmdf & OLECMDF_SUPPORTED) ? S_OK : OLECMDERR_E_NOTSUPPORTED; } - return hres; + FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); + return OLECMDERR_E_UNKNOWNGROUP; } static HRESULT exec_from_table(HTMLDocument *This, const cmdtable_t *cmdtable, DWORD cmdid,

1 0

Jacek Caban : mshtml: Added OLECMDID_OPTICAL_ZOOM tests and stub.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 286e4a86550458a0096b11284f47e312b5087e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=286e4a86550458a0096b11284… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 20:04:52 2015 +0100 mshtml: Added OLECMDID_OPTICAL_ZOOM tests and stub. --- dlls/mshtml/olecmd.c | 14 +++++++++++--- dlls/mshtml/tests/htmldoc.c | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 9417311..5916010 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -546,6 +546,12 @@ static HRESULT exec_get_print_template(HTMLDocument *This, DWORD nCmdexecopt, VA return E_NOTIMPL; } +static HRESULT exec_optical_zoom(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); + return E_NOTIMPL; +} + static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) { FIXME("(%p)\n", This); @@ -695,7 +701,7 @@ static HRESULT query_enabled_stub(HTMLDocument *This, OLECMD *cmd) static const struct { OLECMDF cmdf; HRESULT (*func)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); -} exec_table[OLECMDID_GETPRINTTEMPLATE+1] = { +} exec_table[] = { {0}, { OLECMDF_SUPPORTED, exec_open }, /* OLECMDID_OPEN */ { OLECMDF_SUPPORTED, exec_new }, /* OLECMDID_NEW */ @@ -735,7 +741,9 @@ static const struct { { OLECMDF_SUPPORTED, exec_close }, /* OLECMDID_CLOSE */ {0},{0},{0}, { OLECMDF_SUPPORTED, exec_set_print_template }, /* OLECMDID_SETPRINTTEMPLATE */ - { OLECMDF_SUPPORTED, exec_get_print_template } /* OLECMDID_GETPRINTTEMPLATE */ + { OLECMDF_SUPPORTED, exec_get_print_template }, /* OLECMDID_GETPRINTTEMPLATE */ + {0},{0},{0},{0},{0},{0},{0},{0},{0},{0}, + { 0, /* not reported as supported */ exec_optical_zoom } /* OLECMDID_OPTICAL_ZOOM */ }; static const cmdtable_t base_cmds[] = { @@ -874,7 +882,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID HTMLDocument *This = impl_from_IOleCommandTarget(iface); if(!pguidCmdGroup) { - if(nCmdID<OLECMDID_OPEN || nCmdID>OLECMDID_GETPRINTTEMPLATE || !exec_table[nCmdID].func) { + if(nCmdID < OLECMDID_OPEN || nCmdID >= sizeof(exec_table)/sizeof(*exec_table) || !exec_table[nCmdID].func) { WARN("Unsupported cmdID = %d\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ace3128..16d6b45 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6292,7 +6292,7 @@ static void test_clear(IHTMLDocument2 *doc) ok(hres == S_OK, "clear failed: %08x\n", hres); } -static const OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { +static const OLECMDF expect_cmds[] = { 0, OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ OLECMDF_SUPPORTED, /* OLECMDID_NEW */ @@ -6347,7 +6347,7 @@ static void _test_QueryStatus(unsigned line, IUnknown *unk, REFIID cgid, ULONG c return; hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL); - ok(hres == S_OK, "QueryStatus(%u) failed: %08x\n", cmdid, hres); + ok(hres == cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED, "QueryStatus(%u) failed: %08x\n", cmdid, hres); IOleCommandTarget_Release(cmdtrg); @@ -6380,7 +6380,7 @@ static void test_MSHTML_QueryStatus(IHTMLDocument2 *doc, DWORD cmdf) static void test_OleCommandTarget(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; - OLECMD cmds[OLECMDID_GETPRINTTEMPLATE]; + OLECMD cmds[sizeof(expect_cmds)/sizeof(*expect_cmds)-1]; int i; HRESULT hres; @@ -6389,7 +6389,7 @@ static void test_OleCommandTarget(IHTMLDocument2 *doc) if(FAILED(hres)) return; - for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + for(i=0; i < sizeof(cmds)/sizeof(*cmds); i++) { cmds[i].cmdID = i+1; cmds[i].cmdf = 0xf0f0; } @@ -6401,7 +6401,7 @@ static void test_OleCommandTarget(IHTMLDocument2 *doc) CHECK_CALLED(QueryStatus_OPEN); CHECK_CALLED(QueryStatus_NEW); - for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + for(i=0; i < sizeof(cmds)/sizeof(*cmds); i++) { ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %x\n", i, cmds[i].cmdID); if(i+1 == OLECMDID_FIND) continue; @@ -6624,6 +6624,31 @@ static void test_exec_noargs(IUnknown *unk, DWORD cmdid) IOleCommandTarget_Release(cmdtrg); } +static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor) +{ + IOleCommandTarget *cmdtrg; + VARIANT v; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + V_VT(&v) = VT_I4; + V_I4(&v) = factor; + + SET_EXPECT(GetOverrideKeyPath); + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM, + OLECMDEXECOPT_DODEFAULT, &v, NULL); + todo_wine ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres); + CLEAR_CALLED(GetOverrideKeyPath); + + IOleCommandTarget_Release(cmdtrg); + + test_QueryStatus((IUnknown*)doc, NULL, OLECMDID_OPTICAL_ZOOM, 0); +} + static void test_IsDirty(IHTMLDocument2 *doc, HRESULT exhres) { IPersistStreamInit *perinit; @@ -7489,6 +7514,8 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_OleCommandTarget_fail(doc); test_OleCommandTarget(doc); + test_exec_optical_zoom(doc, 200); + test_exec_optical_zoom(doc, 100); test_OnAmbientPropertyChange(doc); test_Window(doc, TRUE); test_external(doc, TRUE);

1 0

Erich E. Hoover : winex11.drv: Update the check for broken nVidia RandR to test for the number of resolutions instead of the number of modes.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 8e9e4a657f29ff018c6296ced1f115ca8731e5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9e4a657f29ff018c6296ced… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Aug 9 13:15:09 2014 -0600 winex11.drv: Update the check for broken nVidia RandR to test for the number of resolutions instead of the number of modes. --- dlls/winex11.drv/xrandr.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fc09020..e9670c3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -386,6 +386,7 @@ static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resource static int xrandr12_init_modes(void) { + unsigned int only_one_resolution = 1, mode_count; XRRScreenResources *resources; XRROutputInfo *output_info; XRRCrtcInfo *crtc_info; @@ -434,21 +435,6 @@ static int xrandr12_init_modes(void) goto done; } - /* Recent (304.64, possibly earlier) versions of the nvidia driver only - * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes - * are only listed through RandR 1.0 / 1.1. This is completely useless, - * but NVIDIA considers this a feature, so it's unlikely to change. The - * best we can do is to fall back to RandR 1.0 and encourage users to - * consider more cooperative driver vendors when we detect such a - * configuration. */ - if (output_info->nmode == 1 && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) - { - ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " - "Please consider using the Nouveau driver instead.\n"); - ret = -1; - goto done; - } - if (!(xrandr12_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr12_modes) * output_info->nmode ))) { ERR("Failed to allocate xrandr mode info array.\n"); @@ -480,6 +466,32 @@ static int xrandr12_init_modes(void) } } + mode_count = X11DRV_Settings_GetModeCount(); + for (i = 1; i < mode_count; ++i) + { + if (dd_modes[i].width != dd_modes[0].width || dd_modes[i].height != dd_modes[0].height) + { + only_one_resolution = 0; + break; + } + } + + /* Recent (304.64, possibly earlier) versions of the nvidia driver only + * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes + * are only listed through RandR 1.0 / 1.1. This is completely useless, + * but NVIDIA considers this a feature, so it's unlikely to change. The + * best we can do is to fall back to RandR 1.0 and encourage users to + * consider more cooperative driver vendors when we detect such a + * configuration. */ + if (only_one_resolution && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) + { + ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " + "Please consider using the Nouveau driver instead.\n"); + ret = -1; + HeapFree( GetProcessHeap(), 0, xrandr12_modes ); + goto done; + } + X11DRV_Settings_AddDepthModes(); ret = 0;

1 0