March 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_ds_location().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 5bf5bc2784254db16f55a347c9fd56456fa8728f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf5bc2784254db16f55a347c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:26 2016 +0100 wined3d: Get resource info from the texture in surface_load_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ceea4fe..4f1c379 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2798,8 +2798,9 @@ void surface_modify_ds_location(struct wined3d_surface *surface, /* Context activation is done by the caller. */ static void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { + struct wined3d_texture *texture = surface->container; + struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = surface->resource.device; GLsizei w, h; TRACE("surface %p, context %p, new location %#x.\n", surface, context, location); @@ -2896,7 +2897,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, surface_from_resource(wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)), NULL, WINED3D_LOCATION_DRAWABLE); - surface_depth_blt(surface, context, surface->container->texture_rgb.name, + surface_depth_blt(surface, context, texture->texture_rgb.name, 0, surface->pow2Height - h, w, h, surface->texture_target); checkGLcall("depth_blt");

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_copy_simple_location().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 484f5f1ec5caa8e38ee5e6f721a25c7afbc58f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484f5f1ec5caa8e38ee5e6f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:27 2016 +0100 wined3d: Get resource info from the texture in surface_copy_simple_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4f1c379..b4e667f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2956,7 +2956,7 @@ static DWORD resource_access_from_location(DWORD location) static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_device *device = surface->container->resource.device; struct wined3d_context *context; const struct wined3d_gl_info *gl_info; struct wined3d_bo_address dst, src;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_drawable().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: fad52d785976c06f3577375905d867a1f9fa1b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad52d785976c06f357737590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:28 2016 +0100 wined3d: Get resource info from the texture in surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b4e667f..2f423bf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3034,10 +3034,11 @@ static void surface_load_sysmem(struct wined3d_surface *surface, static HRESULT surface_load_drawable(struct wined3d_surface *surface, struct wined3d_context *context) { + struct wined3d_texture *texture = surface->container; RECT r; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && wined3d_resource_is_offscreen(&surface->container->resource)) + && wined3d_resource_is_offscreen(&texture->resource)) { ERR("Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.\n"); return WINED3DERR_INVALIDCALL; @@ -3045,7 +3046,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, surface_get_rect(surface, NULL, &r); surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); - surface_blt_to_drawable(surface->resource.device, context, + surface_blt_to_drawable(texture->resource.device, context, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_texture().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: d71699141b5d53e4bc49fa4ba56785a850417f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71699141b5d53e4bc49fa4ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:29 2016 +0100 wined3d: Get resource info from the texture in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f423bf..a7394f8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3058,9 +3058,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, unsigned int width, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; const RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = surface->resource.device; - const struct wined3d_color_key_conversion *conversion; struct wined3d_texture *texture = surface->container; + struct wined3d_device *device = texture->resource.device; + const struct wined3d_color_key_conversion *conversion; struct wined3d_bo_address data; struct wined3d_format format; POINT dst_point = {0, 0}; @@ -3076,10 +3076,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) - && (surface->container->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) + && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, - NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) + NULL, texture->resource.usage, texture->resource.pool, texture->resource.format, + NULL, texture->resource.usage, texture->resource.pool, texture->resource.format)) { if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, @@ -3092,10 +3092,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) - && (!srgb || (surface->container->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) + && (!srgb || (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, - NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) + NULL, texture->resource.usage, texture->resource.pool, texture->resource.format, + NULL, texture->resource.usage, texture->resource.pool, texture->resource.format)) { DWORD src_location = surface->locations & WINED3D_LOCATION_RB_RESOLVED ? WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_renderbuffer().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 38f921a8a966d7279a45c845fa60e34d7e77ea29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f921a8a966d7279a45c845f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:30 2016 +0100 wined3d: Get resource info from the texture in surface_load_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a7394f8..cab1451 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3232,7 +3232,7 @@ static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wi else /* surface_blt_fbo will load the source location if necessary. */ src_location = WINED3D_LOCATION_TEXTURE_RGB; - surface_blt_fbo(surface->resource.device, context, WINED3D_TEXF_POINT, + surface_blt_fbo(surface->container->resource.device, context, WINED3D_TEXF_POINT, surface, src_location, &rect, surface, dst_location, &rect); }

1 0

Stefan Dösinger : wined3d: Avoid storing color and rectangle pointers in struct wined3d_cs_clear.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 7d65065ecb08f2eef59bf0d6e3a3aa397bccb46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d65065ecb08f2eef59bf0d6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 24 18:24:31 2016 +0100 wined3d: Avoid storing color and rectangle pointers in struct wined3d_cs_clear. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0e6cc5b..91e1759 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -67,12 +67,12 @@ struct wined3d_cs_present struct wined3d_cs_clear { enum wined3d_cs_op opcode; - DWORD rect_count; - const RECT *rects; DWORD flags; - const struct wined3d_color *color; + struct wined3d_color color; float depth; DWORD stencil; + unsigned int rect_count; + RECT rects[1]; }; struct wined3d_cs_draw @@ -287,7 +287,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) wined3d_get_draw_rect(&device->state, &draw_rect); device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, &device->fb, op->rect_count, op->rects, &draw_rect, op->flags, - op->color, op->depth, op->stencil); + &op->color, op->depth, op->stencil); } void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, @@ -295,14 +295,14 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * { struct wined3d_cs_clear *op; - op = cs->ops->require_space(cs, sizeof(*op)); + op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count])); op->opcode = WINED3D_CS_OP_CLEAR; - op->rect_count = rect_count; - op->rects = rects; op->flags = flags; - op->color = color; + op->color = *color; op->depth = depth; op->stencil = stencil; + op->rect_count = rect_count; + memcpy(op->rects, rects, sizeof(*rects) * rect_count); cs->ops->submit(cs); }

1 0

Louis Lenders : gdiplus: GdipTransformPath should return Ok if matrix = NULL.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 36fdc6abf19bc53dfb33532464f3613f95444239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fdc6abf19bc53dfb3353246… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Mar 22 21:07:05 2016 +0100 gdiplus: GdipTransformPath should return Ok if matrix = NULL. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 58e99a2..963ee1c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1216,11 +1216,9 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes if(path->pathdata.Count == 0) return Ok; - if(matrix){ - stat = GdipTransformPath(path, matrix); - if (stat != Ok) - return stat; - } + stat = GdipTransformPath(path, matrix); + if(stat != Ok) + return stat; pt = path->pathdata.Points[0]; if(!init_path_list(&list, pt.X, pt.Y)) @@ -1677,7 +1675,7 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) if(!path) return InvalidParameter; - if(path->pathdata.Count == 0) + if(path->pathdata.Count == 0 || !matrix) return Ok; return GdipTransformMatrixPoints(matrix, path->pathdata.Points,

1 0

Louis Lenders : gdiplus/tests: Add test for GdipTransformPath with null-matrix.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 2d6daeb8ea0746e9561e67c67f8fe23aa8ee57b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6daeb8ea0746e9561e67c67… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Mar 22 21:18:56 2016 +0100 gdiplus/tests: Add test for GdipTransformPath with null-matrix. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 24619e5..c43fb42 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1012,6 +1012,9 @@ static void test_flatten(void) status = GdipFlattenPath(path, NULL, 1.0); expect(Ok, status); + status = GdipTransformPath(path, 0); + expect(Ok, status); + status = GdipAddPathEllipse(path, 0.0, 0.0, 100.0, 50.0); expect(Ok, status);

1 0

Alexandre Julliard : winebuild: Add support for creating static import libraries.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: aac69889bf1e276688895eca313dc861cab07545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac69889bf1e276688895eca3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 15:32:22 2016 +0900 winebuild: Add support for creating static import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 132 ++++++++++++++++++++++++++++++++++++--- tools/winebuild/utils.c | 7 +++ tools/winebuild/winebuild.man.in | 2 +- 4 files changed, 131 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 5cf984b..03b88fa 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -233,6 +233,7 @@ extern char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__ extern struct strarray strarray_fromstring( const char *str, const char *delim ); extern void strarray_add( struct strarray *array, ... ); extern void strarray_addv( struct strarray *array, char * const *argv ); +extern void strarray_addall( struct strarray *array, struct strarray args ); extern DECLSPEC_NORETURN void fatal_error( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern DECLSPEC_NORETURN void fatal_perror( const char *msg, ... ) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 1d561c4..d2d6f57 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -68,6 +68,10 @@ static struct strarray ext_link_imports; /* list of external symbols to link to static struct list dll_imports = LIST_INIT( dll_imports ); static struct list dll_delayed = LIST_INIT( dll_delayed ); +static struct strarray as_files; + +static const char import_func_prefix[] = "__wine$func$"; +static const char import_ord_prefix[] = "__wine$ord$"; static inline const char *ppc_reg( int reg ) { @@ -1283,16 +1287,56 @@ void output_imports( DLLSPEC *spec ) output_external_link_imports( spec ); } -/* output an import library for a Win32 module and additional object files */ -void output_import_lib( DLLSPEC *spec, char **argv ) +/* create a new asm temp file */ +static void new_output_as_file( const char *prefix ) +{ + char *name = get_temp_file_name( prefix, ".s" ); + + if (output_file) fclose( output_file ); + if (!(output_file = fopen( name, "w" ))) + fatal_error( "Unable to create output file '%s'\n", name ); + strarray_add( &as_files, name, NULL ); +} + +/* assemble all the asm files */ +static void assemble_files( const char *prefix ) +{ + unsigned int i; + + if (output_file) fclose( output_file ); + output_file = NULL; + + for (i = 0; i < as_files.count; i++) + { + char *obj = get_temp_file_name( prefix, ".o" ); + assemble_file( as_files.str[i], obj ); + as_files.str[i] = obj; + } +} + +/* build a library from the current asm files and any additional object files in argv */ +static void build_library( const char *output_name, char **argv, int create ) +{ + struct strarray args = find_tool( "ar", NULL ); + struct strarray ranlib = find_tool( "ranlib", NULL ); + + strarray_add( &args, create ? "rc" : "r", output_name, NULL ); + strarray_addall( &args, as_files ); + strarray_addv( &args, argv ); + if (create) unlink( output_name ); + spawn( args ); + + strarray_add( &ranlib, output_name, NULL ); + spawn( ranlib ); +} + +/* create a Windows-style import library */ +static void build_windows_import_lib( DLLSPEC *spec ) { struct strarray args; char *def_file; const char *as_flags, *m_flag; - if (target_platform != PLATFORM_WINDOWS) - fatal_error( "Unix-style import libraries not supported yet\n" ); - def_file = get_temp_file_name( output_file_name, ".def" ); fclose( output_file ); if (!(output_file = fopen( def_file, "w" ))) @@ -1320,13 +1364,81 @@ void output_import_lib( DLLSPEC *spec, char **argv ) if (m_flag) strarray_add( &args, "-m", m_flag, as_flags, NULL ); spawn( args ); +} + +/* create a Unix-style import library */ +static void build_unix_import_lib( DLLSPEC *spec ) +{ + static const char valid_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._@"; + int i, total; + const char *name, *prefix; + char *dll_name = xstrdup( spec->file_name ); - if (argv[0]) + if (strendswith( dll_name, ".dll" )) dll_name[strlen(dll_name) - 4] = 0; + if (strspn( dll_name, valid_chars ) < strlen( dll_name )) + fatal_error( "%s contains invalid characters\n", spec->file_name ); + + /* entry points */ + + for (i = total = 0; i < spec->nb_entry_points; i++) + { + const ORDDEF *odp = &spec->entry_points[i]; + + if (odp->name) name = odp->name; + else if (odp->export_name) name = odp->export_name; + else continue; + + if (odp->flags & FLAG_PRIVATE) continue; + total++; + + /* C++ mangled names cannot be imported */ + if (strpbrk( name, "?@" )) continue; + + switch(odp->type) + { + case TYPE_VARARGS: + case TYPE_CDECL: + case TYPE_STDCALL: + case TYPE_THISCALL: + prefix = (!odp->name || (odp->flags & FLAG_ORDINAL)) ? import_ord_prefix : import_func_prefix; + new_output_as_file( spec->file_name ); + output( "\t.text\n" ); + output( "\n\t.align %d\n", get_alignment( get_ptr_size() )); + output( "\t%s\n", func_declaration( name ) ); + output( "%s\n", asm_globl( name ) ); + output( "\t%s %s%s$%u$%s\n", get_asm_ptr_keyword(), + asm_name( prefix ), dll_name, odp->ordinal, name ); + output_function_size( name ); + break; + + default: + break; + } + } + if (!total) warning( "%s: Import library doesn't export anything\n", spec->file_name ); + + if (!as_files.count) /* create a dummy file to avoid empty import libraries */ + { + new_output_as_file( spec->file_name ); + output( "\t.text\n" ); + } + + assemble_files( spec->file_name ); + free( dll_name ); +} + +/* output an import library for a Win32 module and additional object files */ +void output_import_lib( DLLSPEC *spec, char **argv ) +{ + if (target_platform == PLATFORM_WINDOWS) + { + build_windows_import_lib( spec ); + if (argv[0]) build_library( output_file_name, argv, 0 ); + } + else { - args = find_tool( "ar", NULL ); - strarray_add( &args, "rs", output_file_name, NULL ); - strarray_addv( &args, argv ); - spawn( args ); + build_unix_import_lib( spec ); + build_library( output_file_name, argv, 1 ); } output_file_name = NULL; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index c513565..9308e83 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -182,6 +182,13 @@ void strarray_addv( struct strarray *array, char * const *argv ) while (*argv) strarray_add_one( array, *argv++ ); } +void strarray_addall( struct strarray *array, struct strarray args ) +{ + unsigned int i; + + for (i = 0; i < args.count; i++) strarray_add_one( array, args.str[i] ); +} + struct strarray strarray_fromstring( const char *str, const char *delim ) { const char *tok; diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 2063738..d99fb57 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -47,7 +47,7 @@ Build a .def file from a spec file. The .spec file is specified via the \fB-E\fR option. This is used when building dlls with a PE (Win32) compiler. .TP .BI \--implib -Build a PE import library from a spec file. The .spec file is +Build a .a import library from a spec file. The .spec file is specified via the \fB-E\fR option. .TP .B \--resources

1 0

Alexandre Julliard : winebuild: Add support for linking to static import libraries.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 13fe69714bbf719d9ddbcf8d34d025f48da3af7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fe69714bbf719d9ddbcf8d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 15:33:35 2016 +0900 winebuild: Add support for linking to static import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 57 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index d2d6f57..4fbcab0 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -309,6 +309,28 @@ void add_extra_ld_symbol( const char *name ) strarray_add( &extra_ld_symbols, name, NULL ); } +/* retrieve an imported dll, adding one if necessary */ +struct import *add_static_import_dll( const char *name ) +{ + struct import *import; + char *dll_name = get_dll_name( name, NULL ); + + if ((import = find_import_dll( dll_name ))) return import; + + import = xmalloc( sizeof(*import) ); + memset( import, 0, sizeof(*import) ); + + import->dll_name = dll_name; + import->full_name = xstrdup( dll_name ); + import->c_name = make_c_identifier( dll_name ); + + if (is_delayed_import( dll_name )) + list_add_tail( &dll_delayed, &import->entry ); + else + list_add_tail( &dll_imports, &import->entry ); + return import; +} + /* add a function to the list of imports from a given dll */ static void add_import_func( struct import *imp, const char *name, const char *export_name, int ordinal ) { @@ -324,6 +346,26 @@ static void add_import_func( struct import *imp, const char *name, const char *e imp->nb_imports++; } +/* add an import for an undefined function of the form __wine$func$ */ +static void add_undef_import( const char *name, int is_ordinal ) +{ + char *p, *dll_name = xstrdup( name ); + int ordinal = 0; + struct import *import; + + if (!(p = strchr( dll_name, '$' ))) return; + *p++ = 0; + while (*p >= '0' && *p <= '9') ordinal = 10 * ordinal + *p++ - '0'; + if (*p != '$') return; + p++; + + import = add_static_import_dll( dll_name ); + if (is_ordinal) + add_import_func( import, NULL, xstrdup( p ), ordinal ); + else + add_import_func( import, xstrdup( p ), NULL, ordinal ); +} + /* get the default entry point for a given spec file */ static const char *get_default_entry_point( const DLLSPEC *spec ) { @@ -351,7 +393,7 @@ static void add_extra_undef_symbols( DLLSPEC *spec ) if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point(spec) ); add_extra_ld_symbol( spec->init_func ); if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); - if (!list_empty( &dll_delayed )) add_extra_ld_symbol( "__wine_spec_delay_load" ); + if (delayed_imports.count) add_extra_ld_symbol( "__wine_spec_delay_load" ); } /* check if a given imported dll is not needed, taking forwards into account */ @@ -518,7 +560,11 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) while (*p == ' ') p++; if (p[0] == 'U' && p[1] == ' ' && p[2]) p += 2; if (prefix_len && !strncmp( p, name_prefix, prefix_len )) p += prefix_len; - strarray_add( &undef_symbols, xstrdup( p ), NULL ); + if (!strncmp( p, import_func_prefix, strlen(import_func_prefix) )) + add_undef_import( p + strlen( import_func_prefix ), 0 ); + else if (!strncmp( p, import_ord_prefix, strlen(import_ord_prefix) )) + add_undef_import( p + strlen( import_ord_prefix ), 1 ); + else strarray_add( &undef_symbols, xstrdup( p ), NULL ); } if ((err = pclose( f ))) warning( "%s failed with status %d\n", cmd, err ); free( cmd ); @@ -526,13 +572,13 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) void resolve_dll_imports( DLLSPEC *spec, struct list *list ) { - unsigned int j, removed; + unsigned int j; struct import *imp, *next; ORDDEF *odp; LIST_FOR_EACH_ENTRY_SAFE( imp, next, list, struct import, entry ) { - for (j = removed = 0; j < undef_symbols.count; j++) + for (j = 0; j < undef_symbols.count; j++) { odp = find_export( undef_symbols.str[j], imp->exports, imp->nb_exports ); if (odp) @@ -546,11 +592,10 @@ void resolve_dll_imports( DLLSPEC *spec, struct list *list ) add_import_func( imp, (odp->flags & FLAG_NONAME) ? NULL : odp->name, odp->export_name, odp->ordinal ); remove_name( &undef_symbols, j-- ); - removed++; } } } - if (!removed) + if (!imp->nb_imports) { /* the dll is not used, get rid of it */ if (check_unused( imp, spec ))

1 0