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

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

June 4, 2019

Module: wine Branch: master Commit: 74ebaacb1af5864a1a5609a376e1b9bc9d231d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ebaacb1af5864a1a5609a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 15:49:53 2019 +0430 wined3d: Pass a wined3d_context_gl structure to glsl_blitter_upload_palette(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 54dfd96..fe8812b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12769,17 +12769,17 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter /* Context activation is done by the caller. */ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture *texture) + struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_palette *palette; - palette = texture->swapchain ? texture->swapchain->palette : NULL; + palette = texture_gl->t.swapchain ? texture_gl->t.swapchain->palette : NULL; if (!blitter->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &blitter->palette_texture); - context_active_texture(context, gl_info, 1); + context_active_texture(&context_gl->c, gl_info, 1); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, blitter->palette_texture); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -12799,7 +12799,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, GL_UNSIGNED_INT_8_8_8_8_REV, &black); } - context_active_texture(context, gl_info, 0); + context_active_texture(&context_gl->c, gl_info, 0); } /* Context activation is done by the caller. */ @@ -13062,7 +13062,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli switch (get_complex_fixup(program->args.fixup)) { case COMPLEX_FIXUP_P8: - glsl_blitter_upload_palette(glsl_blitter, context, src_texture); + glsl_blitter_upload_palette(glsl_blitter, context_gl, src_texture_gl); break; case COMPLEX_FIXUP_YUY2:

1 0

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

June 4, 2019

Module: wine Branch: master Commit: 15619c773ef6b3e6a53c43abd8a7d87053f0b245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15619c773ef6b3e6a53c43ab… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 3 21:50:16 2019 +0200 urlmon: 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/urlmon/file.c | 12 ++++++------ dlls/urlmon/ftp.c | 12 ++++++------ dlls/urlmon/http.c | 12 ++++++------ dlls/urlmon/mk.c | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index cc1ba81..e703e72 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; @@ -40,7 +40,7 @@ typedef struct { static inline FileProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, FileProtocol, IUnknown_outer); + return CONTAINING_RECORD(iface, FileProtocol, IUnknown_inner); } static inline FileProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) @@ -60,7 +60,7 @@ static HRESULT WINAPI FileProtocolUnk_QueryInterface(IUnknown *iface, REFIID rii *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -428,14 +428,14 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret = heap_alloc(sizeof(FileProtocol)); - ret->IUnknown_outer.lpVtbl = &FileProtocolUnkVtbl; + ret->IUnknown_inner.lpVtbl = &FileProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &FileProtocolExVtbl; ret->IInternetPriority_iface.lpVtbl = &FilePriorityVtbl; ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : &ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppobj = &ret->IUnknown_outer; + *ppobj = &ret->IUnknown_inner; return S_OK; } diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 75704ce..8e6ec4e 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; IWinInetHttpInfo IWinInetHttpInfo_iface; @@ -39,7 +39,7 @@ typedef struct { static inline FtpProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, FtpProtocol, IUnknown_outer); + return CONTAINING_RECORD(iface, FtpProtocol, IUnknown_inner); } static inline FtpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) @@ -131,7 +131,7 @@ static HRESULT WINAPI FtpProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -462,13 +462,13 @@ HRESULT FtpProtocol_Construct(IUnknown *outer, void **ppv) ret = heap_alloc_zero(sizeof(FtpProtocol)); ret->base.vtbl = &AsyncProtocolVtbl; - ret->IUnknown_outer.lpVtbl = &FtpProtocolUnkVtbl; + ret->IUnknown_inner.lpVtbl = &FtpProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &FtpProtocolVtbl; ret->IInternetPriority_iface.lpVtbl = &FtpPriorityVtbl; ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl; ret->ref = 1; - ret->outer = outer ? outer : &ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppv = &ret->IUnknown_outer; + *ppv = &ret->IUnknown_inner; return S_OK; } diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 1762787..ad1d0d8 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; IWinInetHttpInfo IWinInetHttpInfo_iface; @@ -47,7 +47,7 @@ typedef struct { static inline HttpProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, HttpProtocol, IUnknown_outer); + return CONTAINING_RECORD(iface, HttpProtocol, IUnknown_inner); } static inline HttpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) @@ -637,7 +637,7 @@ static HRESULT WINAPI HttpProtocolUnk_QueryInterface(IUnknown *iface, REFIID rii if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -967,16 +967,16 @@ static HRESULT create_http_protocol(BOOL https, IUnknown *outer, void **ppobj) return E_OUTOFMEMORY; ret->base.vtbl = &AsyncProtocolVtbl; - ret->IUnknown_outer.lpVtbl = &HttpProtocolUnkVtbl; + ret->IUnknown_inner.lpVtbl = &HttpProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &HttpProtocolVtbl; ret->IInternetPriority_iface.lpVtbl = &HttpPriorityVtbl; ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl; ret->https = https; ret->ref = 1; - ret->outer = outer ? outer : &ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppobj = &ret->IUnknown_outer; + *ppobj = &ret->IUnknown_inner; URLMON_LockModule(); return S_OK; diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index d73a00c..7af8f0c 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; IInternetProtocolEx IInternetProtocolEx_iface; LONG ref; @@ -36,7 +36,7 @@ typedef struct { static inline MkProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, MkProtocol, IUnknown_outer); + return CONTAINING_RECORD(iface, MkProtocol, IUnknown_inner); } static inline MkProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) @@ -50,7 +50,7 @@ static HRESULT WINAPI MkProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -372,15 +372,15 @@ HRESULT MkProtocol_Construct(IUnknown *outer, void **ppv) ret = heap_alloc(sizeof(MkProtocol)); - ret->IUnknown_outer.lpVtbl = &MkProtocolUnkVtbl; + ret->IUnknown_inner.lpVtbl = &MkProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &MkProtocolVtbl; ret->ref = 1; - ret->outer = outer ? outer : &ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_inner; ret->stream = NULL; /* NOTE: * Native returns NULL ppobj and S_OK in CreateInstance if called with IID_IUnknown riid and no outer. */ - *ppv = &ret->IUnknown_outer; + *ppv = &ret->IUnknown_inner; return S_OK; }

1 0

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

June 4, 2019

Module: wine Branch: master Commit: b1472d13d0cc174aef3ad84695c35f1a3f116d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1472d13d0cc174aef3ad846… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 15:49:51 2019 +0430 wined3d: Pass a wined3d_context_gl structure to arbfp_blit_set(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 05c4519..e6546ab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7548,11 +7548,10 @@ static GLuint arbfp_gen_plain_shader(const struct wined3d_gl_info *gl_info, cons } /* Context activation is done by the caller. */ -static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context *context, +static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context_gl *context_gl, 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; struct wine_rb_entry *entry; @@ -7913,7 +7912,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl color_key = &alpha_test_key; } - arbfp_blit_set(arbfp_blitter, context, src_texture_gl, src_sub_resource_idx, color_key); + arbfp_blit_set(arbfp_blitter, context_gl, src_texture_gl, src_sub_resource_idx, color_key); /* Draw a textured quad */ context_draw_textured_quad(context, src_texture_gl,

1 0

Alexandre Julliard : winebuild: Don' t even try to resolve imports for PE builds.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: ded2e82f16fb142c8056ba7833d139a1acc94e22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ded2e82f16fb142c8056ba78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 12:38:43 2019 +0200 winebuild: Don't even try to resolve imports for PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 - tools/winebuild/import.c | 1 + tools/winebuild/main.c | 18 +++++++----------- tools/winebuild/spec16.c | 5 ++--- tools/winebuild/spec32.c | 21 ++------------------- 5 files changed, 12 insertions(+), 34 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 49473c7..241fd60 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -306,7 +306,6 @@ extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ); extern void output_spec32_file( DLLSPEC *spec ); -extern void output_pe_module( DLLSPEC *spec ); extern void output_fake_module( DLLSPEC *spec ); extern void output_def_file( DLLSPEC *spec, int include_stubs ); extern void load_res16_file( const char *name, DLLSPEC *spec ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index d8abc9d..6c68dbd 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1311,6 +1311,7 @@ void output_stubs( DLLSPEC *spec ) /* output the import and delayed import tables of a Win32 module */ void output_imports( DLLSPEC *spec ) { + if (target_platform == PLATFORM_WINDOWS) return; output_immediate_imports(); output_delayed_imports( spec ); output_immediate_import_thunks(); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 781d391..831db5d 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -630,26 +630,22 @@ int main(int argc, char **argv) /* fall through */ case MODE_EXE: load_resources( argv, spec ); - load_import_libs( argv ); if (spec_file_name && !parse_input_file( spec )) break; + if (fake_module) { if (spec->type == SPEC_WIN16) output_fake_module16( spec ); else output_fake_module( spec ); break; } - read_undef_symbols( spec, argv ); - switch (spec->type) + if (target_platform != PLATFORM_WINDOWS) { - case SPEC_WIN16: - output_spec16_file( spec ); - break; - case SPEC_WIN32: - if (target_platform == PLATFORM_WINDOWS) output_pe_module( spec ); - else output_spec32_file( spec ); - break; - default: assert(0); + load_import_libs( argv ); + read_undef_symbols( spec, argv ); + resolve_imports( spec ); } + if (spec->type == SPEC_WIN16) output_spec16_file( spec ); + else output_spec32_file( spec ); break; case MODE_DEF: if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index b21f472..3a7e457 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -815,17 +815,16 @@ void output_spec16_file( DLLSPEC *spec16 ) { DLLSPEC *spec32 = alloc_dll_spec(); - resolve_imports( spec16 ); add_16bit_exports( spec32, spec16 ); needs_get_pc_thunk = 0; open_output_file(); output_standard_file_header(); - if (target_platform != PLATFORM_WINDOWS) output_module( spec32 ); + output_module( spec32 ); output_module16( spec16 ); output_stubs( spec16 ); output_exports( spec32 ); - if (target_platform != PLATFORM_WINDOWS) output_imports( spec16 ); + output_imports( spec16 ); if (is_undefined( "__wine_call_from_16" )) output_asm_relays16(); if (needs_get_pc_thunk) output_get_pc_thunk(); if (spec16->main_module) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index a0aa017..f1dedcc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -584,6 +584,8 @@ void output_module( DLLSPEC *spec ) switch (target_platform) { + case PLATFORM_WINDOWS: + return; /* nothing to do */ case PLATFORM_APPLE: output( "\t.text\n" ); output( "\t.align %d\n", get_alignment(page_size) ); @@ -710,7 +712,6 @@ void output_module( DLLSPEC *spec ) void output_spec32_file( DLLSPEC *spec ) { needs_get_pc_thunk = 0; - resolve_imports( spec ); open_output_file(); output_standard_file_header(); output_module( spec ); @@ -725,24 +726,6 @@ void output_spec32_file( DLLSPEC *spec ) /******************************************************************* - * output_pe_module - * - * Build a PE from a spec file. - */ -void output_pe_module( DLLSPEC *spec ) -{ - UsePIC = 0; - resolve_imports( spec ); - open_output_file(); - output_standard_file_header(); - output_stubs( spec ); - output_exports( spec ); - output_resources( spec ); - close_output_file(); -} - - -/******************************************************************* * output_fake_module * * Build a fake binary module from a spec file.

1 0

Alexandre Julliard : configure: Use pkg-config to check for zlib.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 7ac6cdfa000199930e7f8664825d6944e16ac1f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac6cdfa000199930e7f8664… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 12:28:50 2019 +0200 configure: Use pkg-config to check for zlib. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 53 ++++++++++++++++++++++++++++++++++++++------ configure.ac | 18 ++++++++------- dlls/cabinet/Makefile.in | 1 + dlls/dbghelp/Makefile.in | 1 + dlls/opcservices/Makefile.in | 1 + dlls/wininet/Makefile.in | 1 + 6 files changed, 60 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 910bb57..2981306 100755 --- a/configure +++ b/configure @@ -672,6 +672,7 @@ PULSE_LIBS PULSE_CFLAGS GETTEXTPO_LIBS Z_LIBS +Z_CFLAGS FREETYPE_LIBS FREETYPE_CFLAGS LCMS2_LIBS @@ -1837,6 +1838,8 @@ LCMS2_CFLAGS LCMS2_LIBS FREETYPE_CFLAGS FREETYPE_LIBS +Z_CFLAGS +Z_LIBS PULSE_CFLAGS PULSE_LIBS GSTREAMER_CFLAGS @@ -2618,6 +2621,8 @@ Some influential environment variables: C compiler flags for freetype2, overriding pkg-config FREETYPE_LIBS Linker flags for freetype2, overriding pkg-config + Z_CFLAGS C compiler flags for libz, overriding pkg-config + Z_LIBS Linker flags for libz, overriding pkg-config PULSE_CFLAGS C compiler flags for libpulse, overriding pkg-config PULSE_LIBS Linker flags for libpulse, overriding pkg-config @@ -4162,7 +4167,7 @@ fi # Check whether --with-zlib was given. if test "${with_zlib+set}" = set; then : - withval=$with_zlib; if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi + withval=$with_zlib; fi @@ -7479,8 +7484,7 @@ for ac_header in \ unistd.h \ utime.h \ valgrind/memcheck.h \ - valgrind/valgrind.h \ - zlib.h + valgrind/valgrind.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -14263,15 +14267,39 @@ done LIBS="$ac_wine_check_funcs_save_LIBS" -if test "$ac_cv_header_zlib_h" = "yes" +if test "x$with_zlib" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5 + if ${Z_CFLAGS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + Z_CFLAGS=`$PKG_CONFIG --cflags libz 2>/dev/null` +fi +fi + +if ${Z_LIBS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + Z_LIBS=`$PKG_CONFIG --libs libz 2>/dev/null` +fi +fi + +Z_LIBS=${Z_LIBS:-"-lz"} +$as_echo "$as_me:${as_lineno-$LINENO}: libz cflags: $Z_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libz libs: $Z_LIBS" >&5 +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $Z_CFLAGS" +for ac_header in zlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ZLIB_H 1 +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5 $as_echo_n "checking for inflate in -lz... " >&6; } if ${ac_cv_lib_z_inflate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" +LIBS="-lz $Z_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14305,10 +14333,20 @@ if test "x$ac_cv_lib_z_inflate" = xyes; then : $as_echo "#define HAVE_ZLIB 1" >>confdefs.h - Z_LIBS="-lz" +else + Z_LIBS="" +fi +else + Z_LIBS="" fi +done + +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$Z_CFLAGS" || Z_CFLAGS=`echo " $Z_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$Z_LIBS" || Z_LIBS=`echo " $Z_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$Z_LIBS" = "x"; then : case "x$with_zlib" in @@ -19636,6 +19674,7 @@ LCMS2_CFLAGS = $LCMS2_CFLAGS LCMS2_LIBS = $LCMS2_LIBS FREETYPE_CFLAGS = $FREETYPE_CFLAGS FREETYPE_LIBS = $FREETYPE_LIBS +Z_CFLAGS = $Z_CFLAGS Z_LIBS = $Z_LIBS GETTEXTPO_LIBS = $GETTEXTPO_LIBS PULSE_CFLAGS = $PULSE_CFLAGS diff --git a/configure.ac b/configure.ac index be15cca..52c933e 100644 --- a/configure.ac +++ b/configure.ac @@ -109,8 +109,7 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) -AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]), - [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi]) +AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)])) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -544,8 +543,7 @@ AC_CHECK_HEADERS(\ unistd.h \ utime.h \ valgrind/memcheck.h \ - valgrind/valgrind.h \ - zlib.h + valgrind/valgrind.h ) WINE_HEADER_MAJOR() AC_HEADER_STAT() @@ -1570,10 +1568,14 @@ WINE_CHECK_LIB_FUNCS(\ [$PTHREAD_LIBS]) dnl **** Check for zlib **** -if test "$ac_cv_header_zlib_h" = "yes" -then - AC_CHECK_LIB(z,inflate,[AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).]) - AC_SUBST(Z_LIBS,"-lz")]) +if test "x$with_zlib" != "xno" +then + WINE_PACKAGE_FLAGS(Z,[libz],[-lz],,, + [AC_CHECK_HEADERS(zlib.h, + [AC_CHECK_LIB(z,inflate, + [AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).])], + [Z_LIBS=""],[$Z_LIBS])], + [Z_LIBS=""])]) fi WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in index 1abf09d..50cc564 100644 --- a/dlls/cabinet/Makefile.in +++ b/dlls/cabinet/Makefile.in @@ -1,5 +1,6 @@ MODULE = cabinet.dll IMPORTLIB = cabinet +EXTRAINCL = $(Z_CFLAGS) EXTRALIBS = $(Z_LIBS) C_SRCS = \ diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 3e120e8..f08464c 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -2,6 +2,7 @@ MODULE = dbghelp.dll IMPORTLIB = dbghelp EXTRADEFS = -D_IMAGEHLP_SOURCE_ DELAYIMPORTS = version +EXTRAINCL = $(Z_CFLAGS) EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS) C_SRCS = \ diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 42b64b3..1b81db6 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,5 +1,6 @@ MODULE = opcservices.dll IMPORTS = uuid ole32 advapi32 urlmon xmllite oleaut32 +EXTRAINCL = $(Z_CFLAGS) EXTRALIBS = $(Z_LIBS) C_SRCS = \ diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 6789c9d..6eeb7cf 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -3,6 +3,7 @@ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 ws2_32 advapi32 DELAYIMPORTS = secur32 crypt32 cryptui +EXTRAINCL = $(Z_CFLAGS) EXTRALIBS = $(CORESERVICES_LIBS) $(Z_LIBS) C_SRCS = \

1 0

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

June 4, 2019

Module: wine Branch: master Commit: 842d404342c62b07d252c8ed30adc846109bbfed URL: https://source.winehq.org/git/wine.git/?a=commit;h=842d404342c62b07d252c8ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:14:04 2019 +0200 fusion: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/Makefile.in | 2 ++ dlls/fusion/asmcache.c | 41 +++++++++++++++++----------------- dlls/fusion/asmenum.c | 53 ++++++++++++++++++++++---------------------- dlls/fusion/asmname.c | 27 +++++++++++----------- dlls/fusion/assembly.c | 9 ++++---- dlls/fusion/fusion.c | 17 +++++++------- dlls/mscoree/tests/mscoree.c | 10 ++++----- 7 files changed, 78 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=842d404342c62b07d252…

1 0

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

June 4, 2019

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

1 0

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

June 4, 2019

Module: wine Branch: master Commit: 155a858df51c237a8c1f266c019f2409e70652d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=155a858df51c237a8c1f266c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:10:11 2019 +0200 fntcache: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fntcache/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/fntcache/Makefile.in b/dlls/fntcache/Makefile.in index 4d5342c..8e791a3 100644 --- a/dlls/fntcache/Makefile.in +++ b/dlls/fntcache/Makefile.in @@ -1,5 +1,7 @@ MODULE = fntcache.dll IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

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

June 4, 2019

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

1 0

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

June 4, 2019

Module: wine Branch: master Commit: a7b57b6872e1cfabcb02406218abd59fe9ef856d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b57b6872e1cfabcb024062… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 15:49:52 2019 +0430 wined3d: Pass a wined3d_context_gl structure to create_dummy_textures(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 751676b..fe7d0e9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -672,11 +672,12 @@ out: } /* Context activation is done by the caller. */ -static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) +static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl) { - struct wined3d_dummy_textures *textures = &wined3d_device_gl(device)->dummy_textures; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_dummy_textures *textures = &device_gl->dummy_textures; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int i; DWORD color; @@ -689,7 +690,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ * OpenGL will only allow that when a valid texture is bound. * We emulate this by creating dummy textures and binding them * to each texture stage when the currently set D3D texture is NULL. */ - context_active_texture(context, gl_info, 0); + context_active_texture(&context_gl->c, gl_info, 0); gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_1d); TRACE("Dummy 1D texture given name %u.\n", textures->tex_1d); @@ -802,7 +803,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("create dummy textures"); - context_bind_dummy_textures(context); + context_bind_dummy_textures(&context_gl->c); } /* Context activation is done by the caller. */ @@ -1081,6 +1082,7 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) void wined3d_device_create_primary_opengl_context_cs(void *object) { struct wined3d_device *device = object; + struct wined3d_context_gl *context_gl; struct wined3d_swapchain *swapchain; struct wined3d_context *context; struct wined3d_texture *target; @@ -1108,7 +1110,8 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; context = context_acquire(device, target, 0); - create_dummy_textures(device, context); + context_gl = wined3d_context_gl(context); + wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); create_default_samplers(device, context); context_release(context); }

1 0