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

Michael Stefaniuc : mshtml: Use the standard field name for an inner IUnknown.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: bf70a8ac8821891f0c2fda2339cda0f77dbe7b70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf70a8ac8821891f0c2fda23… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 3 21:50:15 2019 +0200 mshtml: Use the standard field name for an inner IUnknown. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 10 +++++----- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3d82dd4..1ccfa30 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5656,7 +5656,7 @@ HRESULT get_document_node(nsIDOMDocument *dom_document, HTMLDocumentNode **ret) static inline HTMLDocumentObj *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_outer); + return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_inner); } static HRESULT WINAPI HTMLDocumentObj_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -5666,7 +5666,7 @@ static HRESULT WINAPI HTMLDocumentObj_QueryInterface(IUnknown *iface, REFIID rii TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(htmldoc_qi(&This->basedoc, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else if(IsEqualGUID(&IID_ICustomDoc, riid)) { @@ -5858,11 +5858,11 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii return E_OUTOFMEMORY; doc->ref = 1; - doc->IUnknown_outer.lpVtbl = &HTMLDocumentObjVtbl; + doc->IUnknown_inner.lpVtbl = &HTMLDocumentObjVtbl; doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); - init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_outer, &doc->dispex.IDispatchEx_iface); + init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_inner, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); doc->basedoc.doc_obj = doc; doc->is_mhtml = is_mhtml; @@ -5879,7 +5879,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii } if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &doc->IUnknown_outer; + *ppv = &doc->IUnknown_inner; }else { hres = htmldoc_query_interface(&doc->basedoc, riid, ppv); htmldoc_release(&doc->basedoc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8beea34..e75e4a2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -656,7 +656,7 @@ static inline ULONG htmldoc_release(HTMLDocument *This) struct HTMLDocumentObj { HTMLDocument basedoc; DispatchEx dispex; - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; ICustomDoc ICustomDoc_iface; IOleDocumentView IOleDocumentView_iface; IViewObjectEx IViewObjectEx_iface;

1 0

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

June 4, 2019

Module: wine Branch: master Commit: d7775121700baa5425c32e81d7633f7481804eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7775121700baa5425c32e81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 15:49:50 2019 +0430 wined3d: Pass a wined3d_context_gl structure to arbfp_blitter_upload_palette(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e4a0b42..05c4519 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7346,11 +7346,11 @@ static GLuint gen_p8_shader(const struct wined3d_gl_info *gl_info, const struct } /* Context activation is done by the caller. */ -static void upload_palette(struct wined3d_arbfp_blitter *blitter, - const struct wined3d_texture *texture, struct wined3d_context *context) +static void arbfp_blitter_upload_palette(struct wined3d_arbfp_blitter *blitter, + const struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl) { - const struct wined3d_palette *palette = texture->swapchain ? texture->swapchain->palette : NULL; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_palette *palette = texture_gl->t.swapchain ? texture_gl->t.swapchain->palette : NULL; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!blitter->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &blitter->palette_texture); @@ -7379,7 +7379,7 @@ static void upload_palette(struct wined3d_arbfp_blitter *blitter, } /* Switch back to unit 0 in which the 2D texture will be stored. */ - context_active_texture(context, gl_info, 0); + context_active_texture(&context_gl->c, gl_info, 0); } /* Context activation is done by the caller. */ @@ -7552,8 +7552,9 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const struct wined3d_color_key *color_key) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; enum complex_fixup fixup; - const struct wined3d_gl_info *gl_info = context->gl_info; struct wine_rb_entry *entry; struct arbfp_blit_type type; struct arbfp_blit_desc *desc; @@ -7655,7 +7656,7 @@ err_out: } if (fixup == COMPLEX_FIXUP_P8) - upload_palette(blitter, &texture_gl->t, context); + arbfp_blitter_upload_palette(blitter, texture_gl, context_gl); gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)");

1 0

Alexandre Julliard : fltmgr.sys: Build with msvcrt.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: e4ff8de572296785a6c11158d6d073cc55b3d24f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ff8de572296785a6c11158… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:09:52 2019 +0200 fltmgr.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in index ba106a4..87fe4c3 100644 --- a/dlls/fltmgr.sys/Makefile.in +++ b/dlls/fltmgr.sys/Makefile.in @@ -1,5 +1,7 @@ MODULE = fltmgr.sys EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : explorerframe: Build with msvcrt.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: a003eb5db45ad50c9bbd034a44d969000dbd56bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a003eb5db45ad50c9bbd034a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:08:17 2019 +0200 explorerframe: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 18d054c..8f7208e 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -1,6 +1,8 @@ MODULE = explorerframe.dll IMPORTS = uuid ole32 comctl32 shell32 user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ explorerframe_main.c \ nstc.c \

1 0

Alexandre Julliard : esent: Build with msvcrt.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: aade6e5eb4b5ffd84db7471d10c7875baebcb8c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aade6e5eb4b5ffd84db7471d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:06:28 2019 +0200 esent: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/esent/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/esent/Makefile.in b/dlls/esent/Makefile.in index ab55483..b789ee2 100644 --- a/dlls/esent/Makefile.in +++ b/dlls/esent/Makefile.in @@ -1,4 +1,6 @@ MODULE = esent.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ esent_main.c

1 0

Alexandre Julliard : dxva2: Build with msvcrt.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 63cb594f01f25572e78356d0950790437bf99c34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cb594f01f25572e78356d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:05:45 2019 +0200 dxva2: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index 7b9ef6f..44e125e 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,4 +1,6 @@ MODULE = dxva2.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : fltlib: Build with msvcrt.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 33cb83eee1794e7adc34e50f0a5947ccfab7ca20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33cb83eee1794e7adc34e50f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:09:08 2019 +0200 fltlib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltlib/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in index 65dca20..2fa954e 100644 --- a/dlls/fltlib/Makefile.in +++ b/dlls/fltlib/Makefile.in @@ -1,5 +1,7 @@ MODULE = fltlib.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ fltlib.c

1 0

Alexandre Julliard : faultrep: Build with msvcrt.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: b7818870045ed6e7d1512ad1aab55277864a1e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7818870045ed6e7d1512ad1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:08:42 2019 +0200 faultrep: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/Makefile.in | 2 ++ dlls/faultrep/faultrep.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in index c478df4..70cd1ff 100644 --- a/dlls/faultrep/Makefile.in +++ b/dlls/faultrep/Makefile.in @@ -2,4 +2,6 @@ MODULE = faultrep.dll IMPORTLIB = faultrep IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = faultrep.c diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index 83f9027..3191659 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -24,7 +24,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "errorrep.h" @@ -62,7 +61,7 @@ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) LONG res; TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName)); - bslash = strrchrW(lpAppFileName, '\\'); + bslash = wcsrchr(lpAppFileName, '\\'); if (bslash != NULL) lpAppFileName = bslash + 1; if (*lpAppFileName == '\0')

1 0

Alexandre Julliard : dx8vb: Build with msvcrt.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 351ffd93f0fee1d9a890af5acbcd89a45f84c090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=351ffd93f0fee1d9a890af5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:04:54 2019 +0200 dx8vb: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 2 ++ dlls/dx8vb/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index e0a083a..c11eb9e 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -1,6 +1,8 @@ MODULE = dx8vb.dll IMPORTS = uuid ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index a1ee7c9..7dbe47d 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include <string.h>

1 0

Alexandre Julliard : dwmapi: Build with msvcrt.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 6dbe7aaf886e729a43db18c73243784ea3b6d925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbe7aaf886e729a43db18c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:04:41 2019 +0200 dwmapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/Makefile.in | 2 ++ dlls/dwmapi/dwmapi_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index e6145a5..3a36913 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,6 +1,8 @@ MODULE = dwmapi.dll IMPORTLIB = dwmapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dwmapi_main.c diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index eb06d15..6378a09 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -19,7 +19,6 @@ * */ -#include "config.h" #include <stdarg.h> #define COBJMACROS

1 0