April 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : mtxdm: Implement GetDispenserManager.
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: 3abb995842b2ec3cc85ed9197a714e6f46559e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abb995842b2ec3cc85ed9197… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 10 03:59:45 2017 +0000 mtxdm: Implement GetDispenserManager. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/mtxdm/Makefile.in | 5 +++++ dlls/mtxdm/mtxdm.spec | 1 + dlls/mtxdm/mtxdm_main.c | 36 ++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/mtxdm.h | 34 ++++++++++++++++++++++++++++++++++ 7 files changed, 80 insertions(+) diff --git a/configure b/configure index e4b9dd2..b9be11d 100755 --- a/configure +++ b/configure @@ -1332,6 +1332,7 @@ enable_msxml2 enable_msxml3 enable_msxml4 enable_msxml6 +enable_mtxdm enable_ncrypt enable_nddeapi enable_ndis_sys @@ -18213,6 +18214,7 @@ wine_fn_config_dll msxml3 enable_msxml3 clean wine_fn_config_test dlls/msxml3/tests msxml3_test clean wine_fn_config_dll msxml4 enable_msxml4 clean wine_fn_config_dll msxml6 enable_msxml6 clean +wine_fn_config_dll mtxdm enable_mtxdm wine_fn_config_dll ncrypt enable_ncrypt wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll ndis.sys enable_ndis_sys diff --git a/configure.ac b/configure.ac index a2fc66d..1a5b0de 100644 --- a/configure.ac +++ b/configure.ac @@ -3247,6 +3247,7 @@ WINE_CONFIG_DLL(msxml3,,[clean]) WINE_CONFIG_TEST(dlls/msxml3/tests,[clean]) WINE_CONFIG_DLL(msxml4,,[clean]) WINE_CONFIG_DLL(msxml6,,[clean]) +WINE_CONFIG_DLL(mtxdm) WINE_CONFIG_DLL(ncrypt) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(ndis.sys) diff --git a/dlls/mtxdm/Makefile.in b/dlls/mtxdm/Makefile.in new file mode 100644 index 0000000..63a99b6 --- /dev/null +++ b/dlls/mtxdm/Makefile.in @@ -0,0 +1,5 @@ +MODULE = mtxdm.dll +IMPORTS = uuid ole32 + +C_SRCS = \ + mtxdm_main.c diff --git a/dlls/mtxdm/mtxdm.spec b/dlls/mtxdm/mtxdm.spec new file mode 100644 index 0000000..4aad62f --- /dev/null +++ b/dlls/mtxdm/mtxdm.spec @@ -0,0 +1 @@ +@ cdecl GetDispenserManager(ptr) diff --git a/dlls/mtxdm/mtxdm_main.c b/dlls/mtxdm/mtxdm_main.c new file mode 100644 index 0000000..9b7e1df --- /dev/null +++ b/dlls/mtxdm/mtxdm_main.c @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "comsvcs.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); + + +HRESULT CDECL GetDispenserManager(IDispenserManager **dispenser) +{ + TRACE("%p\n", dispenser); + + return CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)dispenser); +} diff --git a/include/Makefile.in b/include/Makefile.in index 2384c93..f9cb7b4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -513,6 +513,7 @@ HEADER_SRCS = \ msxml2did.h \ msxml6did.h \ msxmldid.h \ + mtxdm.h \ nb30.h \ ncrypt.h \ ndrtypes.h \ diff --git a/include/mtxdm.h b/include/mtxdm.h new file mode 100644 index 0000000..94098ea --- /dev/null +++ b/include/mtxdm.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __MTXDM_H__ +#define __MTXDM_H__ + +#include "comsvcs.h" + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT CDECL GetDispenserManager(IDispenserManager**); + +#ifdef __cplusplus +} +#endif + + +#endif

1 0

Tag wine-2.6 : Alexandre Julliard : Release 2.6
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: refs/tags/wine-2.6 Tag: 8dc23c59a0986fa41988c8120a2cfcff761ebaad URL: http://source.winehq.org/git/wine.git/?a=tag;h=8dc23c59a0986fa41988c8120a2c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 20:03:45 2017 +0200 Release 2.6

1 0

Alexandre Julliard : Release 2.6.
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: 709935314458bd0ce27aab3986ae98cc556cb663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709935314458bd0ce27aab398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 20:03:45 2017 +0200 Release 2.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 793 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 380 insertions(+), 434 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=709935314458bd0ce27aa…

1 0

Jacek Caban : mshtml.idl: Added HTMLAnchorElement coclass declaration.
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: 0636249b0e488377a3c26956a4527366d0d3b012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0636249b0e488377a3c26956a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:45 2017 +0200 mshtml.idl: Added HTMLAnchorElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 4 ++-- include/mshtml.idl | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 75d465f..191677f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLAnchorElement { HTMLElement element; IHTMLAnchorElement IHTMLAnchorElement_iface; nsIDOMHTMLAnchorElement *nsanchor; -} HTMLAnchorElement; +}; static HRESULT navigate_href_new_window(HTMLElement *element, nsAString *href_str, const WCHAR *target) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 74a9eb6..24721eb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9794,6 +9794,24 @@ methods: } /***************************************************************************** + * HTMLAnchorElement coclass + */ +[ + noncreatable, + uuid(3050f248-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLAnchorElement +{ + [default] dispinterface DispHTMLAnchorElement; + /* [source, default] dispinterface HTMLAnchorEvents; */ + /* [source] dispinterface HTMLAnchorEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLAnchorElement; + /* interface IHTMLAnchorElement2; */ + /* interface IHTMLAnchorElement3; */ +} + +/***************************************************************************** * IHTMLAreaElement interface */ [

1 0

Stefan Dösinger : d3d9/tests: Allow 1.0 alpha in SM3 uninitialized varyings tests.
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: 71d3a4a202cd40c63bbc520c0408b203b4557fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d3a4a202cd40c63bbc520c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 12 14:03:45 2017 +0200 d3d9/tests: Allow 1.0 alpha in SM3 uninitialized varyings tests. My Radeon X1600 shows this behavior. This makes the tests less of an exception compared to the other ones, which also expect alpha 0.0 or 1.0. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13a7233..5def528 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20494,8 +20494,8 @@ static void test_uninitialized_varyings(void) {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff000000, TRUE}, {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xffffffff, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0x00000000, FALSE, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0x00000000, FALSE, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, 0, NULL, 0xff7fffff, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xff7fffff, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff7f0000, TRUE, TRUE},

1 0

Nikolay Sivov : gdi32: Fix widths returned by GetCharWidthI().
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: bba13f04c48869956a0171db0e2b4db0f61aab3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba13f04c48869956a0171db0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 13 00:47:39 2017 +0300 gdi32: Fix widths returned by GetCharWidthI(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/tests/font.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ddd0051..3b3f0b5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3809,7 +3809,7 @@ BOOL WINAPI GetCharWidthI(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPINT } for (i = 0; i < count; i++) - buffer[i] = abc->abcA + abc->abcB + abc->abcC; + buffer[i] = abc[i].abcA + abc[i].abcB + abc[i].abcC; HeapFree(GetProcessHeap(), 0, abc); return TRUE; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0b8cfd5..299fadba 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6637,6 +6637,48 @@ static void test_bitmap_font_glyph_index(void) DeleteDC(hdc); } +static void test_GetCharWidthI(void) +{ + static const char *teststr = "wine "; + HFONT hfont, prev_hfont; + WORD glyphs[5]; + INT widths[5]; + LOGFONTA lf; + ABC abc[5]; + int len, i; + DWORD nb; + BOOL ret; + HDC hdc; + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -20; + + hdc = GetDC(0); + + hfont = CreateFontIndirectA(&lf); + prev_hfont = SelectObject(hdc, hfont); + + len = strlen(teststr); + nb = GetGlyphIndicesA(hdc, teststr, len, glyphs, 0); + ok(nb == len, "\n"); + + memset(abc, 0xcc, sizeof(abc)); + ret = GetCharABCWidthsI(hdc, 0, len, glyphs, abc); + ok(ret, "GetCharABCWidthsI failed\n"); + + memset(widths, 0xcc, sizeof(widths)); + ret = GetCharWidthI(hdc, 0, len, glyphs, widths); + ok(ret, "GetCharWidthI failed\n"); + + for (i = 0; i < len; i++) + ok(widths[i] == abc[i].abcA + abc[i].abcB + abc[i].abcC, "%u, glyph %u, got width %d\n", + i, glyphs[i], widths[i]); + + DeleteObject(SelectObject(hdc, prev_hfont)); + ReleaseDC(0, hdc); +} + START_TEST(font) { init(); @@ -6699,6 +6741,7 @@ START_TEST(font) test_GetCharWidth32(); test_fake_bold_font(); test_bitmap_font_glyph_index(); + test_GetCharWidthI(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Jacek Caban : mshtml.idl: Added HTMLXMLHttpRequest coclass declaration.
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: abdec32f68f4a15997f1c879d04a88982fbbe138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdec32f68f4a15997f1c879d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:38 2017 +0200 mshtml.idl: Added HTMLXMLHttpRequest coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 14 ++++++-------- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index ab14c54..30389a4 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -92,20 +92,18 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) return S_OK; } -typedef struct XMLHttpReqEventListener XMLHttpReqEventListener; - typedef struct { + nsIDOMEventListener nsIDOMEventListener_iface; + LONG ref; + HTMLXMLHttpRequest *xhr; +} XMLHttpReqEventListener; + +struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; LONG ref; nsIXMLHttpRequest *nsxhr; XMLHttpReqEventListener *event_listener; -} HTMLXMLHttpRequest; - -struct XMLHttpReqEventListener { - nsIDOMEventListener nsIDOMEventListener_iface; - LONG ref; - HTMLXMLHttpRequest *xhr; }; static void detach_xhr_event_listener(XMLHttpReqEventListener *event_listener) diff --git a/include/mshtml.idl b/include/mshtml.idl index 9a98dc8..74a9eb6 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9134,6 +9134,23 @@ methods: } /***************************************************************************** + * HTMLXMLHttpRequest + */ +[ + noncreatable, + uuid(3051040b-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLXMLHttpRequest +{ + [default] dispinterface DispHTMLXMLHttpRequest; + /* [source, default] dispinterface HTMLXMLHttpRequestEvents; */ + interface IHTMLXMLHttpRequest; + interface IHTMLXMLHttpRequest2; + interface IHTMLDOMConstructor; + interface IEventTarget; +} + +/***************************************************************************** * IHTMLControlElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLImg coclass declaration.
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: f40b54483f2a370cbe8c23608531c119fe71aec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40b54483f2a370cbe8c23608… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:27 2017 +0200 mshtml.idl: Added HTMLImg coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlimg.c | 134 +++++++++++++++++++++++++------------------------- include/mshtml.idl | 21 ++++++++ 2 files changed, 88 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f40b54483f2a370cbe8c2…

1 0

Jacek Caban : mshtml/tests: Added IMarshal and IManagedObject QueryInterface tests.
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: 38436fff29b82567b38ff9ff61d5505e6b11cbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38436fff29b82567b38ff9ff6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:04:29 2017 +0200 mshtml/tests: Added IMarshal and IManagedObject QueryInterface tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 37 +++++++++++++++++++++++-------------- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index db1de1f..cd763f2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -36,6 +36,7 @@ #include "objsafe.h" #include "htiface.h" #include "tlogstg.h" +#include "mscoree.h" static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); @@ -686,32 +687,40 @@ static void _test_disp_value(unsigned line, IUnknown *unk, const char *val) VariantClear(&var); } -#define test_disp(u,id,v) _test_disp(__LINE__,u,id,v) -static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const char *val) -{ - IID iid; - - if(_test_get_dispid(line, unk, &iid)) - ok_(__FILE__,line) (IsEqualGUID(&iid, diid), "unexpected guid %s\n", wine_dbgstr_guid(&iid)); - - if(val) - _test_disp_value(line, unk, val); -} - #define test_disp2(u,id,id2,v) _test_disp2(__LINE__,u,id,id2,v) static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID *diid2, const char *val) { + IUnknown *u; IID iid; + HRESULT hres; if(_test_get_dispid(line, unk, &iid)) - ok_(__FILE__,line) (IsEqualGUID(&iid, diid) || broken(IsEqualGUID(&iid, diid2)), + ok_(__FILE__,line) (IsEqualGUID(&iid, diid) || broken(diid2 && IsEqualGUID(&iid, diid2)), "unexpected guid %s\n", wine_dbgstr_guid(&iid)); + if(!IsEqualGUID(diid, &DIID_DispHTMLWindow2) && !IsEqualGUID(diid, &DIID_DispHTMLLocation)) { + u = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&u); + ok_(__FILE__,line)(hres == E_NOINTERFACE, "Got IMarshal iface\n"); + ok_(__FILE__,line)(!u, "u = %p\n", u); + } + + u = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(unk, &IID_IManagedObject, (void**)&u); + ok_(__FILE__,line)(hres == E_NOINTERFACE, "Got IManagedObject iface\n"); + ok_(__FILE__,line)(!u, "u = %p\n", u); + if(val) _test_disp_value(line, unk, val); } -#define test_class_info(u) _test_class_info(__LINE__,u) +#define test_disp(u,id,v) _test_disp(__LINE__,u,id,v) +static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const char *val) +{ + return _test_disp2(line, unk, diid, NULL, val); +} + +#define test_class_info(id) _test_class_info(__LINE__,id) static void _test_class_info(unsigned line, IUnknown *unk) { IProvideClassInfo *classinfo; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 467b3eb..dafc109 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -45,6 +45,7 @@ #include "tlogstg.h" #include "exdispid.h" #include "mshtml_test.h" +#include "mscoree.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);

1 0

Józef Kucia : wined3d: Add shader_precompile() to shader_backend_ops.
by Alexandre Julliard April 13, 2017

April 13, 2017

Module: wine Branch: master Commit: 2fc56cac4c0aae0b5d0e38df7c5ab89f325f416c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc56cac4c0aae0b5d0e38df7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 13 11:21:44 2017 +0200 wined3d: Add shader_precompile() to shader_backend_ops. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 3 +++ dlls/wined3d/glsl_shader.c | 5 +++++ dlls/wined3d/shader.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index caa0d69..3b1eff9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5669,9 +5669,12 @@ static BOOL shader_arb_has_ffp_proj_control(void *shader_priv) return priv->ffp_proj_control; } +static void shader_arb_precompile(void *shader_priv, struct wined3d_shader *shader) {} + const struct wined3d_shader_backend_ops arb_program_shader_backend = { shader_arb_handle_instruction, + shader_arb_precompile, shader_arb_select, shader_arb_select_compute, shader_arb_disable, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 994e0c7..3f9e7a6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9458,6 +9458,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const } } +static void shader_glsl_precompile(void *shader_priv, struct wined3d_shader *shader) +{ +} + /* Context activation is done by the caller. */ static void shader_glsl_select(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) @@ -10242,6 +10246,7 @@ static BOOL shader_glsl_has_ffp_proj_control(void *shader_priv) const struct wined3d_shader_backend_ops glsl_shader_backend = { shader_glsl_handle_instruction, + shader_glsl_precompile, shader_glsl_select, shader_glsl_select_compute, shader_glsl_disable, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7927062..3681a8d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2852,6 +2852,7 @@ struct shader_none_priv }; static void shader_none_handle_instruction(const struct wined3d_shader_instruction *ins) {} +static void shader_none_precompile(void *shader_priv, struct wined3d_shader *shader) {} static void shader_none_select_compute(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) {} static void shader_none_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) {} @@ -2974,6 +2975,7 @@ static BOOL shader_none_has_ffp_proj_control(void *shader_priv) const struct wined3d_shader_backend_ops none_shader_backend = { shader_none_handle_instruction, + shader_none_precompile, shader_none_select, shader_none_select_compute, shader_none_disable, @@ -3076,8 +3078,11 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader) static void wined3d_shader_init_object(void *object) { struct wined3d_shader *shader = object; + struct wined3d_device *device = shader->device; + + list_add_head(&device->shaders, &shader->shader_list_entry); - list_add_head(&shader->device->shaders, &shader->shader_list_entry); + device->shader_backend->shader_precompile(device->shader_priv, shader); } static void wined3d_shader_destroy_object(void *object) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f1ac37..9e48b49 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1334,6 +1334,7 @@ struct wined3d_vertex_pipe_ops; struct wined3d_shader_backend_ops { void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); + void (*shader_precompile)(void *shader_priv, struct wined3d_shader *shader); void (*shader_select)(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state); void (*shader_select_compute)(void *shader_priv, struct wined3d_context *context,

1 0