January 2015 - Wine-Commits

Jacek Caban : mshtml: Improved IOleCommandTarget:: QueryStatus implementation.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

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 Jan. 22, 2015

Jan. 22, 2015

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

Qian Hong : atl: Improved content type handling of AtlAxCreateControlEx.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: ec52a1f55700989f014851eef0a25641f8bc983a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec52a1f55700989f014851eef… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 16:09:36 2015 +0800 atl: Improved content type handling of AtlAxCreateControlEx. --- dlls/atl/Makefile.in | 2 +- dlls/atl/atl_ax.c | 69 +++++++++++++++++++++++++++++++++++++++---------- dlls/atl100/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 8 +++--- dlls/atl110/Makefile.in | 2 +- dlls/atl80/Makefile.in | 2 +- dlls/atl90/Makefile.in | 2 +- 7 files changed, 65 insertions(+), 22 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 34ae9b8..826a5bf 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl.dll IMPORTLIB = atl -IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_30 C_SRCS = \ diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index d16cdfd..15b0550 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -35,6 +35,7 @@ #include "atlbase.h" #include "atliface.h" #include "atlwin.h" +#include "shlwapi.h" #include "wine/unicode.h" @@ -991,6 +992,48 @@ HRESULT WINAPI AtlAxCreateControl(LPCOLESTR lpszName, HWND hWnd, NULL, NULL, NULL ); } +enum content +{ + IsEmpty = 0, + IsGUID = 1, + IsHTML = 2, + IsURL = 3, + IsUnknown = 4 +}; + +static enum content get_content_type(LPCOLESTR name, CLSID *control_id) +{ + WCHAR new_urlW[MAX_PATH]; + DWORD size = MAX_PATH; + WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'}; + + if (!name || !name[0]) + { + WARN("name %s\n", wine_dbgstr_w(name)); + return IsEmpty; + } + + if (CLSIDFromString(name, control_id) == S_OK || + CLSIDFromProgID(name, control_id) == S_OK) + return IsGUID; + + if (PathIsURLW (name) || + UrlApplySchemeW(name, new_urlW, &size, URL_APPLY_GUESSSCHEME|URL_APPLY_GUESSFILE) == S_OK) + { + *control_id = CLSID_WebBrowser; + return IsURL; + } + + if (!strncmpiW(name, mshtml_prefixW, 7)) + { + FIXME("mshtml prefix not implemented\n"); + *control_id = CLSID_WebBrowser; + return IsHTML; + } + + return IsUnknown; +} + /*********************************************************************** * AtlAxCreateControlEx [atl100.@] * @@ -1005,24 +1048,24 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, CLSID controlId; HRESULT hRes; IOleObject *pControl; - IUnknown *pUnkControl; + IUnknown *pUnkControl = NULL; IPersistStreamInit *pPSInit; - IUnknown *pContainer; - enum {IsGUID=0,IsHTML=1,IsURL=2} content; + IUnknown *pContainer = NULL; + enum content content; TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, ppUnkContainer, ppUnkControl, iidSink, punkSink); - hRes = CLSIDFromString( lpszName, &controlId ); - if ( FAILED(hRes) ) - hRes = CLSIDFromProgID( lpszName, &controlId ); - if ( SUCCEEDED( hRes ) ) - content = IsGUID; - else { - /* FIXME - check for MSHTML: prefix! */ - content = IsURL; - controlId = CLSID_WebBrowser; - } + if (ppUnkContainer) *ppUnkContainer = NULL; + if (ppUnkControl) *ppUnkControl = NULL; + + content = get_content_type(lpszName, &controlId); + + if (content == IsEmpty) + return S_OK; + + if (content == IsUnknown) + return CO_E_CLASSSTRING; hRes = CoCreateInstance( &controlId, 0, CLSCTX_ALL, &IID_IOleObject, (void**) &pControl ); diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 916bd8e..719afe0 100644 --- a/dlls/atl100/Makefile.in +++ b/dlls/atl100/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl100.dll IMPORTLIB = atl100 -IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_100 PARENTSRC = ../atl diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 8cf0a32..699af0a 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -643,8 +643,8 @@ static void test_ax_win(void) ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); - todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); - todo_wine ok(!control, "returned %p\n", control); + ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + ok(!control, "returned %p\n", control); if (control) IUnknown_Release(control); DestroyWindow(hwnd); @@ -652,8 +652,8 @@ static void test_ax_win(void) ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); - todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); - todo_wine ok(!control, "returned %p\n", control); + ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + ok(!control, "returned %p\n", control); if (control) IUnknown_Release(control); DestroyWindow(hwnd); diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index ced0f18..49ba933 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,5 +1,5 @@ MODULE = atl110.dll -IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid +IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_110 PARENTSRC = ../atl diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 4b7bbd7..b3a5a9c 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_80 PARENTSRC = ../atl diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 5fed63b..d3aebe6 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,5 +1,5 @@ MODULE = atl90.dll -IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl

1 0

Nikolay Sivov : dwrite: Initial implementation of GetGlyphPlacements().
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 711b9f0414a7673f7fc702e60d1ef49f7fe50315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=711b9f0414a7673f7fc702e60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 22 14:43:24 2015 +0300 dwrite: Initial implementation of GetGlyphPlacements(). --- dlls/dwrite/analyzer.c | 48 ++++++++++++--- dlls/dwrite/tests/analyzer.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/layout.c | 4 +- 3 files changed, 185 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=711b9f0414a7673f7fc70…

1 0

Matteo Bruni : wined3d: Add separate stencil state setup via GL 2.0+ core functions.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 8ddb7e32f87e2c8f9e10b4dff19d7a896523690f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddb7e32f87e2c8f9e10b4dff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 21 18:32:32 2015 +0100 wined3d: Add separate stencil state setup via GL 2.0+ core functions. --- dlls/wined3d/directx.c | 5 ++++- dlls/wined3d/state.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f50b5e..4b003d2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2889,6 +2889,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ + USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */ USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */ #undef USE_GL_FUNC @@ -4915,7 +4917,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->StencilCaps |= WINED3DSTENCILCAPS_DECR | WINED3DSTENCILCAPS_INCR; } - if (gl_info->supported[EXT_STENCIL_TWO_SIDE] || gl_info->supported[ATI_SEPARATE_STENCIL]) + if (gl_info->supported[WINED3D_GL_VERSION_2_0] || gl_info->supported[EXT_STENCIL_TWO_SIDE] + || gl_info->supported[ATI_SEPARATE_STENCIL]) { caps->StencilCaps |= WINED3DSTENCILCAPS_TWOSIDED; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f7cf14d..7f65998 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -860,7 +860,15 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ gl_info->gl_ops.gl.p_glEnable(GL_STENCIL_TEST); checkGLcall("glEnable GL_STENCIL_TEST"); - if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) + if (gl_info->supported[WINED3D_GL_VERSION_2_0]) + { + GL_EXTCALL(glStencilFuncSeparate(GL_FRONT, func, ref, mask)); + GL_EXTCALL(glStencilOpSeparate(GL_FRONT, stencilFail, depthFail, stencilPass)); + GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func_ccw, ref, mask)); + GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail_ccw, depthFail_ccw, stencilPass_ccw)); + checkGLcall("setting two sided stencil state"); + } + else if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) { /* Apply back first, then front. This function calls glActiveStencilFaceEXT, * which has an effect on the code below too. If we apply the front face @@ -881,7 +889,9 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ checkGLcall("glStencilOpSeparateATI(GL_FRONT, ...)"); GL_EXTCALL(glStencilOpSeparateATI(GL_BACK, stencilFail_ccw, depthFail_ccw, stencilPass_ccw)); checkGLcall("glStencilOpSeparateATI(GL_BACK, ...)"); - } else { + } + else + { ERR("Separate (two sided) stencil not supported on this version of opengl. Caps weren't honored?\n"); } }

1 0

Matteo Bruni : wined3d: Don't normalize R8G8B8A8_UINT attributes.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 270431c220e31db3f0fb5bddcd5e74227515d70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=270431c220e31db3f0fb5bddc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 21 18:32:33 2015 +0100 wined3d: Don't normalize R8G8B8A8_UINT attributes. --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7f65998..3c204ca 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4279,7 +4279,7 @@ static void load_numbered_arrays(struct wined3d_context *context, break; case WINED3DFMT_R8G8B8A8_UINT: - GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); + GL_EXTCALL(glVertexAttrib4ubvARB(i, ptr)); break; case WINED3DFMT_B8G8R8A8_UNORM: if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA])

1 0

Michael Stefaniuc : strmbase: Handle the failure of CoCreateInstance ( PVS-Studio).
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 9fb737de34da2a3cc0f8766012fd86227e3f6d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb737de34da2a3cc0f876601… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 11:01:44 2015 +0100 strmbase: Handle the failure of CoCreateInstance (PVS-Studio). --- dlls/strmbase/pospass.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index b7ba811..e547328 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -236,6 +236,8 @@ HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)ppPassThru); + if (FAILED(hr)) + return hr; IUnknown_QueryInterface(*ppPassThru, &IID_ISeekingPassThru, (void**)&passthru); hr = ISeekingPassThru_Init(passthru, bRenderer, pPin);

1 0

Michael Stefaniuc : strmbase: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 0f2eca579d884a8ffeb4da4459e1f263f5049393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2eca579d884a8ffeb4da445… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 10:58:17 2015 +0100 strmbase: Remove an unused assignment (PVS-Studio). --- dlls/strmbase/dllfunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index d36c919..61ec283 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -169,7 +169,7 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister) if (bRegister) hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, TRUE ); - hr = CoInitialize(NULL); + CoInitialize(NULL); TRACE("Getting IFilterMapper2\r\n"); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,

1 0

Hao Peng : wbemprox: Implement Win32_BaseBoard.Version.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: d5d4c19226273efe1ce1a11782bfbd70e58a70d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d4c19226273efe1ce1a1178… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jan 22 15:51:40 2015 +0800 wbemprox: Implement Win32_BaseBoard.Version. --- dlls/wbemprox/builtin.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 922f6c5..7c22ad8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -311,7 +311,8 @@ static const struct column col_baseboard[] = { prop_nameW, CIM_STRING }, { prop_productW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, - { prop_tagW, CIM_STRING|COL_FLAG_KEY } + { prop_tagW, CIM_STRING|COL_FLAG_KEY }, + { prop_versionW, CIM_STRING } }; static const struct column col_bios[] = { @@ -552,6 +553,8 @@ static const WCHAR baseboard_serialnumberW[] = {'N','o','n','e',0}; static const WCHAR baseboard_tagW[] = {'B','a','s','e',' ','B','o','a','r','d',0}; +static const WCHAR baseboard_versionW[] = + {'1','.','0',0}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; static const WCHAR bios_manufacturerW[] = @@ -644,6 +647,7 @@ struct record_baseboard const WCHAR *product; const WCHAR *serialnumber; const WCHAR *tag; + const WCHAR *version; }; struct record_bios { @@ -881,7 +885,7 @@ struct record_videocontroller static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_versionW } }; static const struct record_bios data_bios[] = {

1 0

Hao Peng : wbemprox: Implement Win32_DiskDrive.PNPDeviceID.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: c0020b3ac39712f20f3c040d308dca76ea1a059d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0020b3ac39712f20f3c040d3… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jan 22 15:08:38 2015 +0800 wbemprox: Implement Win32_DiskDrive.PNPDeviceID. --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f566359..922f6c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -366,6 +366,7 @@ static const struct column col_diskdrive[] = { prop_manufacturerW, CIM_STRING }, { prop_mediatypeW, CIM_STRING }, { prop_modelW, CIM_STRING }, + { prop_pnpdeviceidW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_sizeW, CIM_UINT64 } }; @@ -595,6 +596,8 @@ static const WCHAR diskdrive_mediatype_removableW[] = {'R','e','m','o','v','a','b','l','e',' ','m','e','d','i','a',0}; static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; +static const WCHAR diskdrive_pnpdeviceidW[] = + {'I','D','E','\\','D','i','s','k','\\','V','E','N','_','W','I','N','E',0}; static const WCHAR diskdrive_serialW[] = {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= @@ -695,6 +698,7 @@ struct record_diskdrive const WCHAR *manufacturer; const WCHAR *mediatype; const WCHAR *model; + const WCHAR *pnpdevice_id; const WCHAR *serialnumber; UINT64 size; }; @@ -1621,6 +1625,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * else rec->mediatype = diskdrive_mediatype_removableW; rec->model = diskdrive_modelW; + rec->pnpdevice_id = diskdrive_pnpdeviceidW; rec->serialnumber = diskdrive_serialW; get_freespace( root, &size ); rec->size = size;

1 0