June 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_material_uniform ().
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 7fc2b67228e2f91b1d1a9e57883f5f7d44a20a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fc2b67228e2f91b1d1a9e57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 26 15:24:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_material_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8778c61..3da8961 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1341,10 +1341,10 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex checkGLcall("glUniformMatrix4fv"); } -static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (state->render_states[WINED3D_RS_SPECULARENABLE]) { @@ -1615,7 +1615,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL) - shader_glsl_ffp_vertex_material_uniform(context, state, prog); + shader_glsl_ffp_vertex_material_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_FFP_LIGHTS) {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_texmatrix_uniform ().
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 43daf7478667ca262d5170039ed565149b5d6a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43daf7478667ca262d517003… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 26 15:24:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_texmatrix_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 80e58cc..8778c61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1325,10 +1325,10 @@ static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_con checkGLcall("glUniformMatrix3fv"); } -static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int tex, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_matrix mat; if (tex >= WINED3D_MAX_TEXTURES) @@ -1336,7 +1336,7 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex if (prog->vs.texture_matrix_location[tex] == -1) return; - get_texture_matrix(context, state, tex, &mat); + get_texture_matrix(&context_gl->c, state, tex, &mat); GL_EXTCALL(glUniformMatrix4fv(prog->vs.texture_matrix_location[tex], 1, FALSE, &mat._11)); checkGLcall("glUniformMatrix4fv"); } @@ -1611,7 +1611,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_FFP_TEXMATRIX) { for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) - shader_glsl_ffp_vertex_texmatrix_uniform(context, state, i, prog); + shader_glsl_ffp_vertex_texmatrix_uniform(context_gl, state, i, prog); } if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL)

1 0

Alexandre Julliard : winehid.sys: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 52f68a01ef85cdaccfa62b41f48f6f57eaeee034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f68a01ef85cdaccfa62b41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:39:22 2019 +0200 winehid.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winehid.sys/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index db2feb9..b2363e7 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = winehid.sys IMPORTS = hidclass ntoskrnl -EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ main.c

1 0

Alexandre Julliard : win87em: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: b813f20f08f7922e0e2a335bf3b1cc06b5976c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b813f20f08f7922e0e2a335b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:37:49 2019 +0200 win87em: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win87em.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win87em.dll16/Makefile.in b/dlls/win87em.dll16/Makefile.in index b40ceb0..4021382 100644 --- a/dlls/win87em.dll16/Makefile.in +++ b/dlls/win87em.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = win87em.dll16 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = win87em.c

1 0

Nikolay Sivov : mshtml: Add IDocumentRange stub.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 2451f06bf65b4188729611c72016b9c5615c0bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2451f06bf65b4188729611c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 25 21:49:20 2019 +0300 mshtml: Add IDocumentRange stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ include/mshtmdid.h | 3 ++ include/mshtml.idl | 16 +++++++++ 5 files changed, 105 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 87ee8e6..7595ad8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5159,6 +5159,85 @@ static const IDisplayServicesVtbl DisplayServicesVtbl = { DisplayServices_HasFlowLayout }; +/********************************************************** + * IDocumentRange implementation + */ +static inline HTMLDocument *impl_from_IDocumentRange(IDocumentRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentRange_iface); +} + +static HRESULT WINAPI DocumentRange_QueryInterface(IDocumentRange *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentRange_AddRef(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentRange_Release(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfoCount(IDocumentRange *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfo(IDocumentRange *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentRange_GetIDsOfNames(IDocumentRange *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IDocumentRangeVtbl DocumentRangeVtbl = { + DocumentRange_QueryInterface, + DocumentRange_AddRef, + DocumentRange_Release, + DocumentRange_GetTypeInfoCount, + DocumentRange_GetTypeInfo, + DocumentRange_GetIDsOfNames, + DocumentRange_Invoke, + DocumentRange_createRange, +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5243,6 +5322,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupContainer_iface; else if(IsEqualGUID(&IID_IDisplayServices, riid)) *ppv = &This->IDisplayServices_iface; + else if(IsEqualGUID(&IID_IDocumentRange, riid)) + *ppv = &This->IDocumentRange_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5294,6 +5375,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; + doc->IDocumentRange_iface.lpVtbl = &DocumentRangeVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6bfce89..ef56f1d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -144,6 +144,7 @@ typedef struct EventTarget EventTarget; XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ + XIID(IDocumentRange) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ XIID(IElementTraversal) \ @@ -626,6 +627,7 @@ struct HTMLDocument { IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; IDisplayServices IDisplayServices_iface; + IDocumentRange IDocumentRange_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f6eebbc..586df7d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -171,6 +171,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, @@ -190,6 +191,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 82055f6..87b8877 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4711,4 +4711,7 @@ #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR DISPID_OMDOCUMENT+105 #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL DISPID_OMDOCUMENT+106 +/* IDocumentRange */ +#define DISPID_IDOCUMENTRANGE_CREATERANGE DISPID_OMDOCUMENT+111 + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index f7ebd9e..aea888b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -23451,6 +23451,19 @@ interface IDocumentSelector : IDispatch [out, retval] IHTMLDOMChildrenCollection **pel); } +[ + odl, + oleautomation, + dual, + uuid(305104af-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocumentRange : IDispatch +{ + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + HRESULT createRange( + [out, retval] IHTMLDOMRange **ppIHTMLDOMRange); +} + /***************************************************************************** * DispHTMLDocument dispinterface */ @@ -24058,6 +24071,9 @@ methods: [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL)] IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v); + + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + IHTMLDOMRange *createRange(); } /*****************************************************************************

1 0

Alexandre Julliard : windowscodecsext: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: da368c51c61c7e964afdc61d3ebf59f169d27d2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=da368c51c61c7e964afdc61d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:38:46 2019 +0200 windowscodecsext: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecsext/Makefile.in | 2 ++ dlls/windowscodecsext/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecsext/Makefile.in b/dlls/windowscodecsext/Makefile.in index d4f2a03..66574b6 100644 --- a/dlls/windowscodecsext/Makefile.in +++ b/dlls/windowscodecsext/Makefile.in @@ -2,5 +2,7 @@ MODULE = windowscodecsext.dll IMPORTLIB = windowscodecsext IMPORTS = ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/windowscodecsext/main.c b/dlls/windowscodecsext/main.c index 8835a31..e376202 100644 --- a/dlls/windowscodecsext/main.c +++ b/dlls/windowscodecsext/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS

1 0

Alexandre Julliard : win32s16: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: fd471dfdd42fe3f7c86b62a12f6cd183fe8e2026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd471dfdd42fe3f7c86b62a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:37:42 2019 +0200 win32s16: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32s16.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32s16.dll16/Makefile.in b/dlls/win32s16.dll16/Makefile.in index ce8a5d1..18b671b 100644 --- a/dlls/win32s16.dll16/Makefile.in +++ b/dlls/win32s16.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = win32s16.dll16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,w32skrnl.dll C_SRCS = win32s16.c

1 0

Alexandre Julliard : wimgapi: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 0e232b0b1b3c719f4714f945a851ea7ab4ab84a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e232b0b1b3c719f4714f945… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:37:35 2019 +0200 wimgapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wimgapi/Makefile.in | 2 ++ dlls/wimgapi/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wimgapi/Makefile.in b/dlls/wimgapi/Makefile.in index 7fa2db8..a004ac1 100644 --- a/dlls/wimgapi/Makefile.in +++ b/dlls/wimgapi/Makefile.in @@ -1,4 +1,6 @@ MODULE = wimgapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c index 72437ee..e092fde 100644 --- a/dlls/wimgapi/main.c +++ b/dlls/wimgapi/main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : webservices: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 4da92b60b6e3214f757002e11b68a14b2ce9a724 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da92b60b6e3214f757002e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:36:53 2019 +0200 webservices: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 2 ++ dlls/webservices/channel.c | 9 ++------- dlls/webservices/error.c | 4 ---- dlls/webservices/heap.c | 4 ---- dlls/webservices/listener.c | 7 +------ dlls/webservices/msg.c | 7 +------ dlls/webservices/proxy.c | 4 ---- dlls/webservices/reader.c | 4 ---- dlls/webservices/url.c | 22 +++++++++++----------- dlls/webservices/writer.c | 26 ++++++++------------------ 10 files changed, 25 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4da92b60b6e3214f7570…

1 0

Alexandre Julliard : wdscore: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: ba24a243a0d0315fabaa138dba2d22a610d91ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba24a243a0d0315fabaa138d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:36:27 2019 +0200 wdscore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wdscore/Makefile.in | 2 ++ dlls/wdscore/wdscore_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 5bcdb2c..8bfc6d1 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,4 +1,6 @@ MODULE = wdscore.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ wdscore_main.c diff --git a/dlls/wdscore/wdscore_main.c b/dlls/wdscore/wdscore_main.c index f9a3154..52e4fb4 100644 --- a/dlls/wdscore/wdscore_main.c +++ b/dlls/wdscore/wdscore_main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0