wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Richard Pospesel : widl: Pass a decl_spec_t to write_type_v().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: aa2bd521d93e3d55c2f99b3d05713573fe0c2883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2bd521d93e3d55c2f99b3d… Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Aug 15 20:13:18 2019 -0500 widl: Pass a decl_spec_t to write_type_v(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 4 ++-- tools/widl/expr.c | 4 ++-- tools/widl/header.c | 26 +++++++++++++------------- tools/widl/header.h | 2 +- tools/widl/proxy.c | 2 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 36 +++++++++++++++++++----------------- tools/widl/typetree.h | 11 +++++++++++ 8 files changed, 50 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa2bd521d93e3d55c2f9…

1 0

Zebediah Figura : widl: Store the type for casts and sizeof() expressions as a decl_spec_t.
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: d0e10aa372a3a6f270426475875446a4cbaf96ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0e10aa372a3a6f270426475… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 15 20:13:17 2019 -0500 widl: Store the type for casts and sizeof() expressions as a decl_spec_t. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 12 ++++++------ tools/widl/widltypes.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 85ba463..3d40da5 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -202,7 +202,7 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr) e = xmalloc(sizeof(expr_t)); e->type = type; e->ref = expr; - e->u.tref = tref; + e->u.tref = var->declspec; e->is_const = FALSE; if (type == EXPR_SIZEOF) { @@ -591,7 +591,7 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc break; case EXPR_CAST: result = resolve_expression(expr_loc, cont_type, e->ref); - result.type = e->u.tref; + result.type = e->u.tref.type; break; case EXPR_SIZEOF: result.is_temporary = FALSE; @@ -759,13 +759,13 @@ void write_expr(FILE *h, const expr_t *e, int brackets, break; case EXPR_CAST: fprintf(h, "("); - write_type_decl(h, e->u.tref, NULL); + write_type_decl(h, e->u.tref.type, NULL); fprintf(h, ")"); write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type, local_var_prefix); break; case EXPR_SIZEOF: fprintf(h, "sizeof("); - write_type_decl(h, e->u.tref, NULL); + write_type_decl(h, e->u.tref.type, NULL); fprintf(h, ")"); break; case EXPR_SHL: @@ -917,7 +917,7 @@ int compare_expr(const expr_t *a, const expr_t *b) return ret; return compare_expr(a->u.ext, b->u.ext); case EXPR_CAST: - ret = compare_type(a->u.tref, b->u.tref); + ret = compare_type(a->u.tref.type, b->u.tref.type); if (ret != 0) return ret; /* Fall through. */ @@ -929,7 +929,7 @@ int compare_expr(const expr_t *a, const expr_t *b) case EXPR_POS: return compare_expr(a->ref, b->ref); case EXPR_SIZEOF: - return compare_type(a->u.tref, b->u.tref); + return compare_type(a->u.tref.type, b->u.tref.type); case EXPR_VOID: return 0; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 43931c9..3f2a719 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -319,7 +319,7 @@ struct _expr_t { double dval; const char *sval; const expr_t *ext; - type_t *tref; + decl_spec_t tref; } u; const expr_t *ext2; int is_const;

1 0

Henri Verbeet : wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: 1419a06819234f585fcb67a79998148209b83539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1419a06819234f585fcb67a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 01:49:39 2019 +0430 wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 148 +++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 4 -- 2 files changed, 67 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1419a06819234f585fcb…

1 0

Henri Verbeet : wined3d: Map/unmap bo addresses through the adapter.
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: 400a0dcc8b6b27dc05c71f798c35120cdc9e440d URL: https://source.winehq.org/git/wine.git/?a=commit;h=400a0dcc8b6b27dc05c71f79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 01:49:38 2019 +0430 wined3d: Map/unmap bo addresses through the adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 14 +++++++++ dlls/wined3d/adapter_vk.c | 21 ++++++++++++++ dlls/wined3d/directx.c | 21 ++++++++++++++ dlls/wined3d/surface.c | 61 ++++++++++++++------------------------- dlls/wined3d/texture.c | 65 ++++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 16 +++++++++++ 6 files changed, 120 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=400a0dcc8b6b27dc05c7…

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_ops.texture_prepare_location().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: 75ee0aa9b99d063482cc54928763b23a4d7a140e URL: https://source.winehq.org/git/wine.git/?a=commit;h=75ee0aa9b99d063482cc5492… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 01:49:37 2019 +0430 wined3d: Introduce wined3d_texture_ops.texture_prepare_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 145 +++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 4 +- 2 files changed, 99 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75ee0aa9b99d063482cc…

1 0

Henri Verbeet : wined3d: Introduce wined3d_buffer_ops.buffer_prepare_location().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: 6462ba52690a940ea5240e8028e6a0a6d75cf2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6462ba52690a940ea5240e80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 01:49:36 2019 +0430 wined3d: Introduce wined3d_buffer_ops.buffer_prepare_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 86 ++++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 64 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index eeea57d..d3fcdd4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -593,31 +593,9 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, - struct wined3d_context *context, DWORD location) + struct wined3d_context *context, unsigned int location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - - switch (location) - { - case WINED3D_LOCATION_SYSMEM: - return wined3d_resource_prepare_sysmem(&buffer->resource); - - case WINED3D_LOCATION_BUFFER: - if (buffer_gl->buffer_object) - return TRUE; - - if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) - { - WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); - return FALSE; - } - return wined3d_buffer_gl_create_buffer_object(buffer_gl, context_gl); - - default: - ERR("Invalid location %s.\n", wined3d_debug_location(location)); - return FALSE; - } + return buffer->buffer_ops->buffer_prepare_location(buffer, context, location); } BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, @@ -1434,6 +1412,17 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return WINED3D_OK; } +static BOOL wined3d_buffer_no3d_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + if (location == WINED3D_LOCATION_SYSMEM) + return wined3d_resource_prepare_sysmem(&buffer->resource); + + FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); + + return FALSE; +} + static void wined3d_buffer_no3d_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { @@ -1448,6 +1437,7 @@ static void wined3d_buffer_no3d_download_ranges(struct wined3d_buffer *buffer, s static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { + wined3d_buffer_no3d_prepare_location, wined3d_buffer_no3d_upload_ranges, wined3d_buffer_no3d_download_ranges, }; @@ -1462,6 +1452,34 @@ HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wine return wined3d_buffer_init(buffer_no3d, device, desc, data, parent, parent_ops, &wined3d_buffer_no3d_ops); } +static BOOL wined3d_buffer_gl_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + + switch (location) + { + case WINED3D_LOCATION_SYSMEM: + return wined3d_resource_prepare_sysmem(&buffer->resource); + + case WINED3D_LOCATION_BUFFER: + if (buffer_gl->buffer_object) + return TRUE; + + if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); + return FALSE; + } + return wined3d_buffer_gl_create_buffer_object(buffer_gl, context_gl); + + default: + ERR("Invalid location %s.\n", wined3d_debug_location(location)); + return FALSE; + } +} + /* Context activation is done by the caller. */ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) @@ -1504,6 +1522,7 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { + wined3d_buffer_gl_prepare_location, wined3d_buffer_gl_upload_ranges, wined3d_buffer_gl_download_ranges, }; @@ -1522,6 +1541,24 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } +static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + switch (location) + { + case WINED3D_LOCATION_SYSMEM: + return wined3d_resource_prepare_sysmem(&buffer->resource); + + case WINED3D_LOCATION_BUFFER: + /* The Vulkan buffer is created during resource creation. */ + return TRUE; + + default: + FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); + return FALSE; + } +} + static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { @@ -1536,6 +1573,7 @@ static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, str static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { + wined3d_buffer_vk_prepare_location, wined3d_buffer_vk_upload_ranges, wined3d_buffer_vk_download_ranges, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b37f2c1..fea3130 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4130,6 +4130,8 @@ struct wined3d_map_range struct wined3d_buffer_ops { + BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data,

1 0

Henri Verbeet : wined3d: Introduce wined3d_resource_prepare_sysmem().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: 3179a6af29dca253a9ae98ce53df17bec53f0c35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3179a6af29dca253a9ae98ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 01:49:35 2019 +0430 wined3d: Introduce wined3d_resource_prepare_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 9 ++------- dlls/wined3d/resource.c | 10 +++++++++- dlls/wined3d/texture.c | 15 ++++----------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b5f44c5..eeea57d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -601,12 +601,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - if (buffer->resource.heap_memory) - return TRUE; - - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - return FALSE; - return TRUE; + return wined3d_resource_prepare_sysmem(&buffer->resource); case WINED3D_LOCATION_BUFFER: if (buffer_gl->buffer_object) @@ -1419,7 +1414,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d if (buffer->locations & WINED3D_LOCATION_SYSMEM || !(buffer->flags & WINED3D_BUFFER_USE_BO)) { - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + if (!wined3d_resource_prepare_sysmem(&buffer->resource)) return E_OUTOFMEMORY; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2897ab1..bba940f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -395,7 +395,7 @@ void CDECL wined3d_resource_preload(struct wined3d_resource *resource) wined3d_cs_emit_preload_resource(resource->device->cs, resource); } -BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) +static BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) { void **p; SIZE_T align = RESOURCE_ALIGNMENT - 1 + sizeof(*p); @@ -415,6 +415,14 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) return TRUE; } +BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) +{ + if (resource->heap_memory) + return TRUE; + + return wined3d_resource_allocate_sysmem(resource); +} + void wined3d_resource_free_sysmem(struct wined3d_resource *resource) { void **p = resource->heap_memory; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4d411bf..7cde07c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1505,14 +1505,6 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t checkGLcall("set compatible renderbuffer"); } -static BOOL wined3d_texture_prepare_sysmem(struct wined3d_texture *texture) -{ - if (texture->resource.heap_memory) - return TRUE; - - return wined3d_resource_allocate_sysmem(&texture->resource); -} - HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality, void *mem, UINT pitch) @@ -1638,7 +1630,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } else { - wined3d_texture_prepare_sysmem(texture); + if (!wined3d_resource_prepare_sysmem(&texture->resource)) + ERR("Failed to allocate resource memory.\n"); valid_location = WINED3D_LOCATION_SYSMEM; } @@ -1813,7 +1806,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned switch (location) { case WINED3D_LOCATION_SYSMEM: - return wined3d_texture_prepare_sysmem(texture); + return wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_USER_MEMORY: if (!texture->user_memory) @@ -3296,7 +3289,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D || !wined3d_texture_use_pbo(texture, gl_info)) { - if (!wined3d_resource_allocate_sysmem(&texture->resource)) + if (!wined3d_resource_prepare_sysmem(&texture->resource)) { wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3446a84..b37f2c1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3437,7 +3437,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; -BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; const struct wined3d_format *wined3d_resource_get_decompress_format( const struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -3445,6 +3444,7 @@ unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *re GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */

1 0

Alex Henrie : utildll: Add DLL.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: dc23cca322a93915465a1ea3ca6f360106cd2018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc23cca322a93915465a1ea3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 13 19:57:47 2019 -0600 utildll: Add DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47616 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/utildll/Makefile.in | 6 ++++++ dlls/utildll/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/utildll/utildll.spec | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+) diff --git a/configure b/configure index 702023b..19a56c9 100755 --- a/configure +++ b/configure @@ -1585,6 +1585,7 @@ enable_usbd_sys enable_user32 enable_userenv enable_usp10 +enable_utildll enable_uuid enable_uxtheme enable_vbscript @@ -20689,6 +20690,7 @@ wine_fn_config_makefile dlls/userenv enable_userenv wine_fn_config_makefile dlls/userenv/tests enable_tests wine_fn_config_makefile dlls/usp10 enable_usp10 wine_fn_config_makefile dlls/usp10/tests enable_tests +wine_fn_config_makefile dlls/utildll enable_utildll wine_fn_config_makefile dlls/uuid enable_uuid wine_fn_config_makefile dlls/uxtheme enable_uxtheme wine_fn_config_makefile dlls/uxtheme/tests enable_tests diff --git a/configure.ac b/configure.ac index 499c4f3..6ce39b8 100644 --- a/configure.ac +++ b/configure.ac @@ -3673,6 +3673,7 @@ WINE_CONFIG_MAKEFILE(dlls/userenv) WINE_CONFIG_MAKEFILE(dlls/userenv/tests) WINE_CONFIG_MAKEFILE(dlls/usp10) WINE_CONFIG_MAKEFILE(dlls/usp10/tests) +WINE_CONFIG_MAKEFILE(dlls/utildll) WINE_CONFIG_MAKEFILE(dlls/uuid) WINE_CONFIG_MAKEFILE(dlls/uxtheme) WINE_CONFIG_MAKEFILE(dlls/uxtheme/tests) diff --git a/dlls/utildll/Makefile.in b/dlls/utildll/Makefile.in new file mode 100644 index 0000000..5bd9a6f --- /dev/null +++ b/dlls/utildll/Makefile.in @@ -0,0 +1,6 @@ +MODULE = utildll.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/utildll/main.c b/dlls/utildll/main.c new file mode 100644 index 0000000..e048794 --- /dev/null +++ b/dlls/utildll/main.c @@ -0,0 +1,43 @@ +/* + * Utility Functions + * + * Copyright 2019 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(utildll); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/utildll/utildll.spec b/dlls/utildll/utildll.spec new file mode 100644 index 0000000..bb04166 --- /dev/null +++ b/dlls/utildll/utildll.spec @@ -0,0 +1,36 @@ +@ stub AsyncDeviceEnumerate +@ stub CachedGetUserFromSid +@ stub CalculateDiffTime +@ stub CalculateElapsedTime +@ stub CompareElapsedTime +@ stub ConfigureModem +@ stub CtxGetAnyDCName +@ stub CurrentDateTimeString +@ stub DateTimeString +@ stub ElapsedTimeString +@ stub EnumerateMultiUserServers +@ stub FormDecoratedAsyncDeviceName +@ stub GetAssociatedPortName +@ stub GetSystemMessageA +@ stub GetSystemMessageW +@ stub GetUnknownString +@ stub GetUserFromSid +@ stub HaveAnonymousUsersChanged +@ stub InitializeAnonymousUserCompareList +@ stub InstallModem +@ stub IsPartOfDomain +@ stub NetBIOSDeviceEnumerate +@ stub NetworkDeviceEnumerate +@ stub ParseDecoratedAsyncDeviceName +@ stub QueryCurrentWinStation +@ stub RegGetNetworkDeviceName +@ stub RegGetNetworkServiceName +@ stub SetupAsyncCdConfig +@ stub StandardErrorMessage +@ stub StrAsyncConnectState +@ stub StrConnectState +@ stub StrProcessState +@ stub StrSdClass +@ stub StrSystemWaitReason +@ stub TestUserForAdmin +@ stub WinEnumerateDevices

1 0

Zebediah Figura : mscorwks: Prefer the native version.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: cf87feee13fa0d2feedb5cd762866aed0ed00dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf87feee13fa0d2feedb5cd7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 15 13:00:33 2019 -0500 mscorwks: Prefer the native version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47622 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscorwks/Makefile.in | 5 +++++ dlls/mscorwks/mscorwks_main.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in index 4527266..42a6238 100644 --- a/dlls/mscorwks/Makefile.in +++ b/dlls/mscorwks/Makefile.in @@ -1 +1,6 @@ MODULE = mscorwks.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + mscorwks_main.c diff --git a/dlls/mscorwks/mscorwks_main.c b/dlls/mscorwks/mscorwks_main.c new file mode 100644 index 0000000..ac77080 --- /dev/null +++ b/dlls/mscorwks/mscorwks_main.c @@ -0,0 +1,36 @@ +/* + * .NET workstation runtime + * + * Copyright 2019 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + } + + return TRUE; +}

1 0

Huw Davies : riched20: Don't force an update when styles are changed.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 04040d0aca34a3f5fec049f1c36e4e0d42a8d525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04040d0aca34a3f5fec049f1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 15 11:06:36 2019 +0100 riched20: Don't force an update when styles are changed. The appropriate region has already been invalidated and will be repainted in due course. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d0034fc..61f7a0e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3578,7 +3578,6 @@ static LRESULT handle_EM_SETCHARFORMAT( ME_TextEditor *editor, WPARAM flags, con { ME_WrapMarkedParagraphs( editor ); ME_UpdateScrollBar( editor ); - ME_Repaint( editor ); } return 1; } @@ -3730,7 +3729,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); - ME_Repaint(editor); return TRUE; } @@ -4005,7 +4003,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, BOOL result = ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); - ME_Repaint(editor); ME_CommitUndo(editor); return result; }

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019