May 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_entry().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: f9224e72840200f2c0723f37c829bfbff3dab16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9224e72840200f2c0723f37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:13 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7cd16d5..aa4606e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -704,10 +704,10 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex } /* Context activation is done by the caller. */ -static void context_apply_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) +static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *context_gl, + GLenum target, struct fbo_entry *entry) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLuint read_binding, draw_binding; unsigned int i; @@ -717,8 +717,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ return; } - read_binding = context->fbo_read_binding; - draw_binding = context->fbo_draw_binding; + read_binding = context_gl->c.fbo_read_binding; + draw_binding = context_gl->c.fbo_draw_binding; wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, entry->id); if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) @@ -734,11 +734,11 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(context, target, i, &entry->key.objects[i + 1], + context_attach_surface_fbo(&context_gl->c, target, i, &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); } - context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], + context_attach_depth_stencil_fbo(&context_gl->c, target, &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility @@ -784,7 +784,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ { context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); - context_apply_fbo_entry(context, target, context->current_fbo); + wined3d_context_gl_apply_fbo_entry(context_gl, target, context->current_fbo); } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_state().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 2d20e498f1d38202275d4e2ce96450aacf998f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d20e498f1d38202275d4e2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:14 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index aa4606e..88ac2ee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -757,34 +757,33 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex } /* Context activation is done by the caller. */ -static void context_apply_fbo_state(struct wined3d_context *context, GLenum target, +static void wined3d_context_gl_apply_fbo_state(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct fbo_entry *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->c.fbo_destroy_list, struct fbo_entry, entry) { wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } - if (context->rebind_fbo) + if (context_gl->c.rebind_fbo) { wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - context->rebind_fbo = FALSE; + context_gl->c.rebind_fbo = FALSE; } if (color_location == WINED3D_LOCATION_DRAWABLE) { - context->current_fbo = NULL; + context_gl->c.current_fbo = NULL; wined3d_context_gl_bind_fbo(context_gl, target, 0); } else { - context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, + context_gl->c.current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); - wined3d_context_gl_apply_fbo_entry(context_gl, target, context->current_fbo); + wined3d_context_gl_apply_fbo_entry(context_gl, target, context_gl->c.current_fbo); } } @@ -810,7 +809,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ ds_info.layer_count = 1; } - context_apply_fbo_state(&context_gl->c, target, context_gl->c.blit_targets, &ds_info, location, location); + wined3d_context_gl_apply_fbo_state(context_gl, target, context_gl->c.blit_targets, &ds_info, location, location); } /* Context activation is done by the caller. */ @@ -3060,13 +3059,13 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, ds_info.layer_count = dsv_gl->v.layer_count; } - context_apply_fbo_state(&context_gl->c, GL_FRAMEBUFFER, context_gl->c.blit_targets, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, context_gl->c.blit_targets, &ds_info, rt_count ? rts[0]->resource->draw_binding : 0, dsv ? dsv->resource->draw_binding : 0); } else { - context_apply_fbo_state(&context_gl->c, GL_FRAMEBUFFER, NULL, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); rt_mask = context_generate_rt_mask_from_resource(rts[0]->resource); } @@ -3162,6 +3161,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context /* Context activation is done by the caller. */ void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int rt_mask = find_draw_buffers_mask(context, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; @@ -3173,7 +3173,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat if (!context->render_offscreen) { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); } else @@ -3206,7 +3206,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat ds_info.layer_count = view_gl->v.layer_count; } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, context->blit_targets, &ds_info, color_location, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_queue_fbo_entry_destruction ().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 66aad5e95f5fdac9ec9b6287b5f1424576f46376 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66aad5e95f5fdac9ec9b6287… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:15 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_queue_fbo_entry_destruction(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 88ac2ee..bd30c14 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1038,27 +1038,27 @@ void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_s context_gl->free_pipeline_statistics_queries[context_gl->free_pipeline_statistics_query_count++] = query->u; } -typedef void (context_fbo_entry_func_t)(struct wined3d_context *context, struct fbo_entry *entry); +typedef void (context_fbo_entry_func_t)(struct wined3d_context_gl *context_gl, struct fbo_entry *entry); -static void context_enum_fbo_entries(const struct wined3d_device *device, +static void wined3d_context_gl_enum_fbo_entries(const struct wined3d_device *device, GLuint name, BOOL rb_namespace, context_fbo_entry_func_t *callback) { unsigned int i, j; for (i = 0; i < device->context_count; ++i) { - struct wined3d_context *context = device->contexts[i]; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(device->contexts[i]); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct fbo_entry *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->c.fbo_list, struct fbo_entry, entry) { for (j = 0; j < gl_info->limits.buffers + 1; ++j) { if (entry->key.objects[j].object == name && !(entry->key.rb_namespace & (1 << j)) == !rb_namespace) { - callback(context, entry); + callback(context_gl, entry); break; } } @@ -1066,10 +1066,11 @@ static void context_enum_fbo_entries(const struct wined3d_device *device, } } -static void context_queue_fbo_entry_destruction(struct wined3d_context *context, struct fbo_entry *entry) +static void wined3d_context_gl_queue_fbo_entry_destruction(struct wined3d_context_gl *context_gl, + struct fbo_entry *entry) { list_remove(&entry->entry); - list_add_head(&context->fbo_destroy_list, &entry->entry); + list_add_head(&context_gl->c.fbo_destroy_list, &entry->entry); } void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) @@ -1091,10 +1092,10 @@ void context_resource_released(const struct wined3d_device *device, struct wined } } -void context_gl_resource_released(struct wined3d_device *device, - GLuint name, BOOL rb_namespace) +void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) { - context_enum_fbo_entries(device, name, rb_namespace, context_queue_fbo_entry_destruction); + wined3d_context_gl_enum_fbo_entries(device, name, rb_namespace, + wined3d_context_gl_queue_fbo_entry_destruction); } void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl,

1 0

Alexandre Julliard : cabinet/tests: Remove duplicate defines.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: d38ec9e226422dc2fb2b5461400ae09858a98012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38ec9e226422dc2fb2b5461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:55:12 2019 +0200 cabinet/tests: Remove duplicate defines. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/tests/fdi.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 80f6a3c..1f1c6e2 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -20,6 +20,8 @@ */ #include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> #include <windows.h> #include "fci.h" #include "fdi.h" @@ -31,16 +33,6 @@ static CHAR CURR_DIR[MAX_PATH]; -/* avoid including CRT headers */ -#ifndef _O_BINARY -# define _O_BINARY 0x8000 -#endif - -#ifndef _S_IREAD -# define _S_IREAD 0x0100 -# define _S_IWRITE 0x0080 -#endif - #include <pshpack1.h> struct CFHEADER

1 0

Alexandre Julliard : winebuild: Support relay debugging for PE builtin dlls.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 6c41cc61529f238fd7a7dc7eb4162d0fe8427e8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c41cc61529f238fd7a7dc7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 21:33:47 2019 +0200 winebuild: Support relay debugging for PE builtin dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 9 ++++++++- dlls/ntdll/relay.c | 47 ++++++++++++++++++++++++++++++++++++++++------- tools/winebuild/spec32.c | 30 ++++++++++++++++++++++-------- 3 files changed, 70 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8dae813..c77f329 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2190,7 +2190,14 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam } SERVER_END_REQ; - if ((wm->ldr.Flags & LDR_IMAGE_IS_DLL) && TRACE_ON(snoop)) SNOOP_SetupDLL( module ); + if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) + { + if (TRACE_ON(relay)) RELAY_SetupDLL( module ); + } + else + { + if ((wm->ldr.Flags & LDR_IMAGE_IS_DLL) && TRACE_ON(snoop)) SNOOP_SetupDLL( module ); + } TRACE_(loaddll)( "Loaded %s at %p: %s\n", debugstr_w(wm->ldr.FullDllName.Buffer), module, dll_type ); diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 255d0e1..1deb2b7 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); struct relay_descr /* descriptor for a module */ { - void *magic; /* signature */ + ULONG_PTR magic; /* signature */ void *relay_call; /* functions to call from relay thunks */ void *private; /* reserved for the relay code private data */ const char *entry_point_base; /* base address of entry point thunks */ @@ -50,7 +50,13 @@ struct relay_descr /* descriptor for a module */ const char *args_string; /* string describing the arguments */ }; -#define RELAY_DESCR_MAGIC ((void *)0xdeb90002) +struct relay_descr_rva /* RVA to the descriptor for PE dlls */ +{ + DWORD magic; + DWORD descr; +}; + +#define RELAY_DESCR_MAGIC 0xdeb90002 #define IS_INTARG(x) (((ULONG_PTR)(x) >> 16) == 0) /* private data built at dll load time */ @@ -837,6 +843,26 @@ __ASM_GLOBAL_FUNC( relay_call, #endif +static struct relay_descr *get_relay_descr( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, + DWORD exp_size ) +{ + struct relay_descr *descr; + struct relay_descr_rva *rva; + ULONG_PTR ptr = (ULONG_PTR)module + exports->Name; + + /* sanity checks */ + if (ptr <= (ULONG_PTR)(exports + 1)) return NULL; + if (ptr > (ULONG_PTR)exports + exp_size) return NULL; + if (ptr % sizeof(DWORD)) return NULL; + + rva = (struct relay_descr_rva *)ptr - 1; + if (rva->magic != RELAY_DESCR_MAGIC) return NULL; + if (rva->descr) descr = (struct relay_descr *)((char *)module + rva->descr); + else descr = (struct relay_descr *)((const char *)exports + exp_size); + if (descr->magic != RELAY_DESCR_MAGIC) return NULL; + return descr; +} + /*********************************************************************** * RELAY_GetProcAddress * @@ -846,9 +872,9 @@ FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *expo DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) { struct relay_private_data *data; - const struct relay_descr *descr = (const struct relay_descr *)((const char *)exports + exp_size); + const struct relay_descr *descr = get_relay_descr( module, exports, exp_size ); - if (descr->magic != RELAY_DESCR_MAGIC || !(data = descr->private)) return proc; /* no relay data */ + if (!descr || !(data = descr->private)) return proc; /* no relay data */ if (!data->entry_points[ordinal].orig_func) return proc; /* not a relayed function */ if (check_from_module( debug_from_relay_includelist, debug_from_relay_excludelist, user )) return proc; /* we want to relay it */ @@ -866,18 +892,19 @@ void RELAY_SetupDLL( HMODULE module ) IMAGE_EXPORT_DIRECTORY *exports; DWORD *funcs; unsigned int i, len; - DWORD size, entry_point_rva; + DWORD size, entry_point_rva, old_prot; struct relay_descr *descr; struct relay_private_data *data; const WORD *ordptr; + void *func_base; + SIZE_T func_size; RtlRunOnceExecuteOnce( &init_once, init_debug_lists, NULL, NULL ); exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &size ); if (!exports) return; - descr = (struct relay_descr *)((char *)exports + size); - if (descr->magic != RELAY_DESCR_MAGIC) return; + if (!(descr = get_relay_descr( module, exports, size ))) return; if (!(data = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) + (exports->NumberOfFunctions-1) * sizeof(data->entry_points) ))) @@ -907,6 +934,10 @@ void RELAY_SetupDLL( HMODULE module ) funcs = (DWORD *)((char *)module + exports->AddressOfFunctions); entry_point_rva = descr->entry_point_base - (const char *)module; + + func_base = funcs; + func_size = exports->NumberOfFunctions * sizeof(*funcs); + NtProtectVirtualMemory( NtCurrentProcess(), &func_base, &func_size, PAGE_READWRITE, &old_prot ); for (i = 0; i < exports->NumberOfFunctions; i++, funcs++) { if (!descr->entry_point_offsets[i]) continue; /* not a normal function */ @@ -916,6 +947,8 @@ void RELAY_SetupDLL( HMODULE module ) data->entry_points[i].orig_func = (char *)module + *funcs; *funcs = entry_point_rva + descr->entry_point_offsets[i]; } + if (old_prot != PAGE_READWRITE) + NtProtectVirtualMemory( NtCurrentProcess(), &func_base, &func_size, old_prot, &old_prot ); } #else /* __i386__ || __x86_64__ || __arm__ || __aarch64__ */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 68b50f9..a0aa017 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -379,6 +379,7 @@ static void output_relay_debug( DLLSPEC *spec ) void output_exports( DLLSPEC *spec ) { int i, fwd_size = 0; + int needs_relay = has_relays( spec ); int nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; const char *func_ptr = (target_platform == PLATFORM_WINDOWS) ? ".rva" : get_asm_ptr_keyword(); @@ -472,6 +473,13 @@ void output_exports( DLLSPEC *spec ) } } + if (needs_relay) + { + output( "\t.long 0xdeb90002\n" ); /* magic */ + if (target_platform == PLATFORM_WINDOWS) output_rva( ".L__wine_spec_relay_descr" ); + else output( "\t.long 0\n" ); + } + /* output the export name strings */ output( "\n.L__wine_spec_exp_names:\n" ); @@ -493,17 +501,23 @@ void output_exports( DLLSPEC *spec ) } } - if (target_platform == PLATFORM_WINDOWS) return; - - output( "\t.align %d\n", get_alignment(get_ptr_size()) ); - output( ".L__wine_spec_exports_end:\n" ); - /* output relays */ - if (!has_relays( spec )) + if (target_platform == PLATFORM_WINDOWS) { - output( "\t%s 0\n", get_asm_ptr_keyword() ); - return; + if (!needs_relay) return; + output( "\t.data\n" ); + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + } + else + { + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + output( ".L__wine_spec_exports_end:\n" ); + if (!needs_relay) + { + output( "\t%s 0\n", get_asm_ptr_keyword() ); + return; + } } output( ".L__wine_spec_relay_descr:\n" );

1 0

Alexandre Julliard : makefiles: Don' t depend on cross import library if not necessary.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 40a76a212bf92547af8f16c0c3d5bcf83cbe7ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a76a212bf92547af8f16c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:54:45 2019 +0200 makefiles: Don't depend on cross import library if not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 24def39..7ed9efd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3553,9 +3553,13 @@ static void output_subdirs( struct makefile *make ) } else { - strarray_add( &build_deps, strmake( "%s.a", importlib_path )); - if (needs_delay_lib( submake )) output( "%s.delay.a ", importlib_path ); + if (needs_delay_lib( submake )) + { + output( "%s.delay.a ", importlib_path ); + strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); + } output( "%s.a: %s", importlib_path, spec_file ); + strarray_add( &build_deps, strmake( "%s.a", importlib_path )); } output_filename( tools_path( make, "winebuild" )); output( "\n" ); @@ -3568,8 +3572,16 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); if (crosstarget && (needs_cross_lib( submake ) || needs_delay_lib( submake ))) { - if (needs_cross_lib( submake )) output_filename( strmake( "%s.cross.a", importlib_path )); - if (needs_delay_lib( submake )) output_filename( strmake( "%s.delay.a", importlib_path )); + if (needs_cross_lib( submake )) + { + output_filename( strmake( "%s.cross.a", importlib_path )); + strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path )); + } + if (needs_delay_lib( submake )) + { + output_filename( strmake( "%s.delay.a", importlib_path )); + strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); + } output( ": %s", spec_file ); output_filename( tools_path( make, "winebuild" )); output( "\n" ); @@ -3578,10 +3590,7 @@ static void output_subdirs( struct makefile *make ) output_filename( "--export" ); output_filename( spec_file ); output( "\n" ); - strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path )); } - if (needs_delay_lib( submake )) - strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); } strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); }

1 0

Alexandre Julliard : makefiles: Use -fshort-wchar when building with msvcrt.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 945efdb6f304fde4399ccfee525816af6cfa5eb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=945efdb6f304fde4399ccfee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:55:39 2019 +0200 makefiles: Use -fshort-wchar when building with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- configure | 35 +++++++++++++++++++++++++++++++---- configure.ac | 4 +++- tools/winebuild/utils.c | 4 ++++ tools/winegcc/winegcc.c | 2 ++ 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 63e58d5..193ecc5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,7 @@ CPPFLAGS = @CPPFLAGS@ CROSSCFLAGS = @CROSSCFLAGS@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRACROSSCFLAGS= @EXTRACROSSCFLAGS@ -MSVCRTFLAGS = @BUILTINFLAG@ +MSVCRTFLAGS = @MSVCRTFLAGS@ TARGETFLAGS = @TARGETFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ diff --git a/configure b/configure index d3253a2..69d085c 100755 --- a/configure +++ b/configure @@ -631,7 +631,8 @@ RT_LIBS POLL_LIBS DL_LIBS TOOLSEXT -BUILTINFLAG +UNWINDFLAGS +MSVCRTFLAGS EXCESS_PRECISION_CFLAGS EXTRACFLAGS VKD3D_LIBS @@ -17121,7 +17122,9 @@ fi ;; esac done - case $host_os in + MSVCRTFLAGS="" + + case $host_os in cygwin*|mingw32*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } @@ -17146,8 +17149,32 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_builtin" >&5 $as_echo "$ac_cv_cflags__fno_builtin" >&6; } if test "x$ac_cv_cflags__fno_builtin" = xyes; then : - BUILTINFLAG="-fno-builtin" - + MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fshort-wchar" >&5 +$as_echo_n "checking whether the compiler supports -fshort-wchar... " >&6; } +if ${ac_cv_cflags__fshort_wchar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fshort-wchar" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fshort_wchar=yes +else + ac_cv_cflags__fshort_wchar=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fshort_wchar" >&5 +$as_echo "$ac_cv_cflags__fshort_wchar" >&6; } +if test "x$ac_cv_cflags__fshort_wchar" = xyes; then : + MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" fi ;; esac diff --git a/configure.ac b/configure.ac index c7f5236..0490b53 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,9 +2011,11 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= done dnl Disable gcc builtins except for Mingw + AC_SUBST(MSVCRTFLAGS,"") case $host_os in cygwin*|mingw32*) ;; - *) WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) ;; + *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) + WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index b8a5125..315643c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -462,6 +462,10 @@ struct strarray get_ld_command(void) break; } } + + if (target_cpu == CPU_ARM && target_platform != PLATFORM_WINDOWS) + strarray_add( &args, "--no-wchar-size-warning", NULL ); + return args; } diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 33f838f..28dce1b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -477,6 +477,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-shared" ); strarray_add( flags, "-Wl,-Bsymbolic" ); + if (!opts->noshortwchar && opts->target_cpu == CPU_ARM) + strarray_add( flags, "-Wl,--no-wchar-size-warning" ); /* Try all options first - this is likely to succeed on modern compilers */ if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic "

1 0

Alistair Leslie-Hughes : wineqtdecoder: Fix compile on MacOS.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 6d0f7b4b7571bb587ebf2b71c2369facb04bb958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d0f7b4b7571bb587ebf2b71… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 17 03:17:23 2019 +0000 wineqtdecoder: Fix compile on MacOS. Regression of 0f9e4cd6600713628c92e3ceb40bd8aa38084f30 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 4e8278b..4ad73d8 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -533,7 +533,7 @@ IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr) return NULL; } - hr = TransformFilter_Construct(sizeof(QTVDecoderImpl), &CLSID_QTVDecoder, + hr = strmbase_transform_create(sizeof(QTVDecoderImpl), &CLSID_QTVDecoder, &QTVDecoder_FuncsTable, (IBaseFilter **)&This); if (FAILED(hr))

1 0

Zebediah Figura : setupapi: Implement SetupDiGetActualSectionToInstallA().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 9c714c3b83ce3febb702f233cbb5cf11a017c63e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c714c3b83ce3febb702f233… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:21:07 2019 -0500 setupapi: Implement SetupDiGetActualSectionToInstallA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 48b6ca3..af91e09 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1798,18 +1798,37 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO devinfo, SP_DEVINFO_DATA *devic } /*********************************************************************** - * SetupDiGetActualSectionToInstallA (SETUPAPI.@) + * SetupDiGetActualSectionToInstallA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetActualSectionToInstallA( - HINF InfHandle, - PCSTR InfSectionName, - PSTR InfSectionWithExt, - DWORD InfSectionWithExtSize, - PDWORD RequiredSize, - PSTR *Extension) +BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF hinf, const char *section, + char *section_ext, DWORD size, DWORD *needed, char **extptr) { - FIXME("\n"); - return FALSE; + WCHAR sectionW[LINE_LEN], section_extW[LINE_LEN], *extptrW; + BOOL ret; + + MultiByteToWideChar(CP_ACP, 0, section, -1, sectionW, ARRAY_SIZE(sectionW)); + + ret = SetupDiGetActualSectionToInstallW(hinf, sectionW, section_extW, + ARRAY_SIZE(section_extW), NULL, &extptrW); + if (ret) + { + if (needed) + *needed = WideCharToMultiByte(CP_ACP, 0, section_extW, -1, NULL, 0, NULL, NULL); + + if (section_ext) + ret = !!WideCharToMultiByte(CP_ACP, 0, section_extW, -1, section_ext, size, NULL, NULL); + + if (extptr) + { + if (extptrW) + *extptr = section_ext + WideCharToMultiByte(CP_ACP, 0, section_extW, + extptrW - section_extW, NULL, 0, NULL, NULL); + else + *extptr = NULL; + } + } + + return ret; } /***********************************************************************

1 0

Zebediah Figura : setupapi: Define the correct platform extensions for each architecture.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: c9e3307f9f90e31df2a15f9f8a2b2d48e7f93a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e3307f9f90e31df2a15f9f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:21:08 2019 -0500 setupapi: Define the correct platform extensions for each architecture. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index af91e09..e41389b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -55,7 +55,15 @@ static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C', static const WCHAR NoInstallClass[] = {'N','o','I','n','s','t','a','l','l','C','l','a','s','s',0}; static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; static const WCHAR NtExtension[] = {'.','N','T',0}; +#ifdef __i386__ static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; +#elif defined(__x86_64__) +static const WCHAR NtPlatformExtension[] = {'.','N','T','a','m','d','6','4',0}; +#elif defined(__arm__) +static const WCHAR NtPlatformExtension[] = {'.','N','T','a','r','m',0}; +#elif defined(__aarch64__) +static const WCHAR NtPlatformExtension[] = {'.','N','T','a','r','m','6','4',0}; +#endif static const WCHAR Signature[] = {'S','i','g','n','a','t','u','r','e',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0};

1 0