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

Alistair Leslie-Hughes : include: Add IDirectSoundFX interfaces.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 3994f3f1bfc52d891b024e4dc659ca6fcb2dd7ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3994f3f1bfc52d891b024e4d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 16 03:34:31 2019 +0000 include: Add IDirectSoundFX interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 351 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3994f3f1bfc52d891b02…

1 0

Zebediah Figura : ntdll: Handle version 2 unwind info on x86_64.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 7ea3a147929533566f9ea8c4e1850879e5b011d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ea3a147929533566f9ea8c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 16 18:31:49 2019 -0500 ntdll: Handle version 2 unwind info on x86_64. It seems this is identical to version 1, but with an additional UWOP_EPILOG opcode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 886d697..cc34995 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3840,7 +3840,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, info = (struct UNWIND_INFO *)((char *)base + function->UnwindData); handler_data = (union handler_data *)&info->opcodes[(info->count + 1) & ~1]; - if (info->version != 1) + if (info->version != 1 && info->version != 2) { FIXME( "unknown unwind info version %u at %p\n", info->version, info ); return NULL;

1 0

Zebediah Figura : ntdll: Handle UWOP_EPILOG directives in x86_64 unwind info.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 08fc532033d339fd820cab95abc271ebe222aa1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=08fc532033d339fd820cab95… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 16 18:31:50 2019 -0500 ntdll: Handle UWOP_EPILOG directives in x86_64 unwind info. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index cc34995..11795e5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -396,6 +396,7 @@ struct UNWIND_INFO #define UWOP_SET_FPREG 3 #define UWOP_SAVE_NONVOL 4 #define UWOP_SAVE_NONVOL_FAR 5 +#define UWOP_EPILOG 6 #define UWOP_SAVE_XMM128 8 #define UWOP_SAVE_XMM128_FAR 9 #define UWOP_PUSH_MACHFRAME 10 @@ -484,6 +485,19 @@ static void dump_unwind_info( ULONG64 base, RUNTIME_FUNCTION *function ) case UWOP_PUSH_MACHFRAME: TRACE( "PUSH_MACHFRAME %u\n", info->opcodes[i].info ); break; + case UWOP_EPILOG: + if (info->version == 2) + { + unsigned int offset; + if (info->opcodes[i].info) + offset = info->opcodes[i].offset; + else + offset = (info->opcodes[i+1].info << 8) + info->opcodes[i+1].offset; + TRACE("epilog %p-%p\n", (char *)base + function->EndAddress - offset, + (char *)base + function->EndAddress - offset + info->opcodes[i].offset ); + i += 1; + break; + } default: FIXME( "unknown code %u\n", info->opcodes[i].code ); break; @@ -3669,6 +3683,7 @@ static int get_opcode_size( struct opcode op ) return 2 + (op.info != 0); case UWOP_SAVE_NONVOL: case UWOP_SAVE_XMM128: + case UWOP_EPILOG: return 2; case UWOP_SAVE_NONVOL_FAR: case UWOP_SAVE_XMM128_FAR: @@ -3904,6 +3919,9 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, case UWOP_PUSH_MACHFRAME: FIXME( "PUSH_MACHFRAME %u\n", info->opcodes[i].info ); break; + case UWOP_EPILOG: + if (info->version == 2) + break; /* nothing to do */ default: FIXME( "unknown code %u\n", info->opcodes[i].code ); break;

1 0

Alexandre Julliard : Wine release 4.14
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: website Branch: master Commit: 1c3a0f22cde9fb2eec78908ee3de34c4b7d5f00e URL: https://source.winehq.org/git/website.git/?a=commit;h=1c3a0f22cde9fb2eec789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 17 00:31:07 2019 +0200 Wine release 4.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019081701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019081701.xml b/news/en/2019081701.xml new file mode 100644 index 0000000..bf71862 --- /dev/null +++ b/news/en/2019081701.xml @@ -0,0 +1,15 @@ +<news> +<date>August 17, 2019</date> +<title>Wine 4.14 Released</title> +<body> + The Wine development release 4.14 is now available. + <a href="{$root}/announce/4.14">What's new</a> in this release: +<ul> + <li>New version of the Mono engine with upstream updates.</li> + <li>PE dlls no longer rely on the MinGW runtime.</li> + <li>Exception handling fixes on ARM64.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.14.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

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

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_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: 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: 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

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