June 2020 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 97a250075ad440b75c7ea9e4e2b413385a13edbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=97a250075ad440b75c7ea9e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:10 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fcb9ff8a1c..eb43f9975e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3829,7 +3829,6 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned { struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; - unsigned int dst_format_flags, src_format_flags = 0; HRESULT hr; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " @@ -3849,12 +3848,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned && filter != WINED3D_TEXF_LINEAR) return WINED3DERR_INVALIDCALL; - dst_format_flags = dst_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) return hr; - src_format_flags = src_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, src_sub_resource_idx % src_texture->level_count, &src_box))) return hr; @@ -3866,8 +3863,8 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned return WINEDDERR_SURFACEBUSY; } - if ((src_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - != (dst_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + if (!src_texture->resource.format->depth_size != !dst_texture->resource.format->depth_size + || !src_texture->resource.format->stencil_size != !dst_texture->resource.format->stencil_size) { WARN("Rejecting depth/stencil blit between incompatible formats.\n"); return WINED3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_blt().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 2ae6de5287541fea1f24b206b54b94fae6e06573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae6de5287541fea1f24b206… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:11 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c95f7a43a..652f6070b9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1483,11 +1483,11 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ struct wined3d_swapchain *src_swapchain, *dst_swapchain; const struct wined3d_color_key *colour_key = NULL; DWORD src_location, dst_location, valid_locations; - DWORD src_ds_flags, dst_ds_flags; struct wined3d_context *context; enum wined3d_blit_op blit_op; BOOL scale, convert, resolve; RECT src_rect, dst_rect; + bool src_ds, dst_ds; static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE @@ -1561,12 +1561,10 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ convert = src_texture->resource.format->id != dst_texture->resource.format->id; resolve = src_texture->resource.multisample_type != dst_texture->resource.multisample_type; - dst_ds_flags = dst_texture->resource.format_flags - & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - src_ds_flags = src_texture->resource.format_flags - & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; - if (src_ds_flags || dst_ds_flags) + if (src_ds || dst_ds) { TRACE("Depth/stencil blit.\n");

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_depth_blt_fbo().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 8d7c39b860f203d623d5a47ee8a00991114f9fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d7c39b860f203d623d5a47e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:12 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eb43f9975e..cd3d4b4912 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -450,7 +450,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - DWORD src_mask, dst_mask; + GLbitfield src_mask, dst_mask; GLbitfield gl_mask; TRACE("device %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " @@ -458,8 +458,17 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); - src_mask = src_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - dst_mask = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_mask = 0; + if (src_texture->resource.format->depth_size) + src_mask |= GL_DEPTH_BUFFER_BIT; + if (src_texture->resource.format->stencil_size) + src_mask |= GL_STENCIL_BUFFER_BIT; + + dst_mask = 0; + if (dst_texture->resource.format->depth_size) + dst_mask |= GL_DEPTH_BUFFER_BIT; + if (dst_texture->resource.format->stencil_size) + dst_mask |= GL_STENCIL_BUFFER_BIT; if (src_mask != dst_mask) { @@ -475,12 +484,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct debug_d3dformat(src_texture->resource.format->id)); return; } - - gl_mask = 0; - if (src_mask & WINED3DFMT_FLAG_DEPTH) - gl_mask |= GL_DEPTH_BUFFER_BIT; - if (src_mask & WINED3DFMT_FLAG_STENCIL) - gl_mask |= GL_STENCIL_BUFFER_BIT; + gl_mask = src_mask; /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */

1 0

Alexandre Julliard : kernel32: Move SetConsoleCtrlHandler() implementation to kernelbase.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 11217ee628a675c8dfe62fe1280e36be83d8dc7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11217ee628a675c8dfe62fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 10:20:09 2020 +0200 kernel32: Move SetConsoleCtrlHandler() implementation to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 148 +--------------------------------------- dlls/kernel32/kernel32.spec | 4 +- dlls/kernelbase/console.c | 105 ++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +- 4 files changed, 111 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11217ee628a675c8dfe6…

1 0

Alexandre Julliard : ntdll: Move the thread startup code to the Unix library.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: be0eb9c92eb7a4fcd9d0d48568c8ed5e8326ef0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0eb9c92eb7a4fcd9d0d485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:32:02 2020 +0200 ntdll: Move the thread startup code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 26 ---- dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 2 +- dlls/ntdll/signal_arm.c | 106 --------------- dlls/ntdll/signal_arm64.c | 144 --------------------- dlls/ntdll/signal_i386.c | 276 ---------------------------------------- dlls/ntdll/signal_powerpc.c | 90 ------------- dlls/ntdll/signal_x86_64.c | 130 ------------------- dlls/ntdll/thread.c | 74 ++++++++++- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/signal_arm.c | 63 +++++++++ dlls/ntdll/unix/signal_arm64.c | 103 +++++++++++++++ dlls/ntdll/unix/signal_i386.c | 88 +++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 84 ++++++++++++ dlls/ntdll/unix/thread.c | 33 ++++- dlls/ntdll/unix/unix_private.h | 8 +- dlls/ntdll/unix/virtual.c | 15 +++ dlls/ntdll/unixlib.h | 5 +- dlls/ntdll/virtual.c | 27 ---- 19 files changed, 467 insertions(+), 812 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be0eb9c92eb7a4fcd9d0…

1 0

Alexandre Julliard : ntdll: Move the thread creation code to the Unix library.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 35b063a404457fdf956d1913738a3c8a66266cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35b063a404457fdf956d1913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 21:09:13 2020 +0200 ntdll: Move the thread creation code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 8 ---- dlls/ntdll/thread.c | 106 ++++------------------------------------- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/thread.c | 94 ++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 7 ++- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 7 +-- 7 files changed, 110 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35b063a404457fdf956d…

1 0

Alexandre Julliard : ntdll: Move more of the thread exit code to the Unix library.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: f1d40d4824b568389cbc328cebb5734430b52e44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d40d4824b568389cbc328c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 21:26:47 2020 +0200 ntdll: Move more of the thread exit code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 17 ----------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/thread.c | 14 ++++++++++++++ dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 3 +-- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d7386f2ab1..d5e34cae3b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -284,9 +284,6 @@ TEB *thread_init(void) */ void WINAPI RtlExitUserThread( ULONG status ) { - static void *prev_teb; - TEB *teb; - if (status) /* send the exit code to the server (0 is already the default) */ { SERVER_START_REQ( terminate_thread ) @@ -306,20 +303,6 @@ void WINAPI RtlExitUserThread( ULONG status ) LdrShutdownThread(); RtlFreeThreadActivationContextStack(); - - pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - - if ((teb = InterlockedExchangePointer( &prev_teb, NtCurrentTeb() ))) - { - struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - - if (thread_data->pthread_id) - { - pthread_join( thread_data->pthread_id, NULL ); - unix_funcs->virtual_free_teb( teb ); - } - } - for (;;) unix_funcs->exit_thread( status ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 30e1fa61b4..1297c451a1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1017,7 +1017,6 @@ static struct unix_funcs unix_funcs = virtual_get_system_info, virtual_create_builtin_view, virtual_alloc_first_teb, - virtual_free_teb, virtual_alloc_thread_stack, virtual_handle_fault, virtual_locked_server_call, diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index eaed27f4b2..205a1312e9 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -218,7 +218,21 @@ void CDECL abort_thread( int status ) */ void CDECL exit_thread( int status ) { + static void *prev_teb; + TEB *teb; + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); + + if ((teb = InterlockedExchangePointer( &prev_teb, NtCurrentTeb() ))) + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; + + if (thread_data->pthread_id) + { + pthread_join( thread_data->pthread_id, NULL ); + virtual_free_teb( teb ); + } + } signal_exit_thread( status, pthread_exit_wrapper ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index eeadf33f1c..14c4ee4cd9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -63,7 +63,6 @@ extern NTSTATUS CDECL virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsig extern void CDECL virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_create_builtin_view( void *module ) DECLSPEC_HIDDEN; extern TEB * CDECL virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; -extern void CDECL virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; extern unsigned int CDECL virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; @@ -134,6 +133,7 @@ extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOO extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; +extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_threading(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b32a004dae..58ecaa6fc4 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2628,7 +2628,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) /*********************************************************************** * virtual_free_teb */ -void CDECL virtual_free_teb( TEB *teb ) +void virtual_free_teb( TEB *teb ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; SIZE_T size; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index a72cd72dc7..67c63fd926 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 18 +#define NTDLL_UNIXLIB_VERSION 19 struct unix_funcs { @@ -92,7 +92,6 @@ struct unix_funcs void (CDECL *virtual_get_system_info)( SYSTEM_BASIC_INFORMATION *info ); NTSTATUS (CDECL *virtual_create_builtin_view)( void *module ); TEB * (CDECL *virtual_alloc_first_teb)(void); - void (CDECL *virtual_free_teb)( TEB *teb ); NTSTATUS (CDECL *virtual_alloc_thread_stack)( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ); NTSTATUS (CDECL *virtual_handle_fault)( LPCVOID addr, DWORD err, BOOL on_signal_stack ); unsigned int (CDECL *virtual_locked_server_call)( void *req_ptr );

1 0

Nikolay Sivov : dwrite: Partially implement GetBaseline().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: c44a0e865b00110f0c490dabe26f2109ed787f47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44a0e865b00110f0c490dab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:53 2020 +0300 dwrite: Partially implement GetBaseline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 58 +++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/analyzer.c | 67 +++++++++++++++++++++++++------------------- 2 files changed, 92 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index cb58f36299..a8a3e7c359 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1539,13 +1539,63 @@ static HRESULT WINAPI dwritetextanalyzer1_ApplyCharacterSpacing(IDWriteTextAnaly return S_OK; } -static HRESULT WINAPI dwritetextanalyzer1_GetBaseline(IDWriteTextAnalyzer2 *iface, IDWriteFontFace *face, +static HRESULT WINAPI dwritetextanalyzer1_GetBaseline(IDWriteTextAnalyzer2 *iface, IDWriteFontFace *fontface, DWRITE_BASELINE baseline, BOOL vertical, BOOL is_simulation_allowed, DWRITE_SCRIPT_ANALYSIS sa, const WCHAR *localeName, INT32 *baseline_coord, BOOL *exists) { - FIXME("(%p %d %d %u %s %p %p): stub\n", face, vertical, is_simulation_allowed, sa.script, debugstr_w(localeName), - baseline_coord, exists); - return E_NOTIMPL; + struct dwrite_fontface *font_obj; + const DWRITE_FONT_METRICS1 *metrics; + + TRACE("%p, %d, %d, %u, %s, %p, %p.\n", fontface, vertical, is_simulation_allowed, sa.script, debugstr_w(localeName), + baseline_coord, exists); + + *exists = FALSE; + *baseline_coord = 0; + + if (baseline == DWRITE_BASELINE_DEFAULT) + baseline = vertical ? DWRITE_BASELINE_CENTRAL : DWRITE_BASELINE_ROMAN; + + if ((unsigned int)baseline > DWRITE_BASELINE_MAXIMUM) + return E_INVALIDARG; + + /* TODO: fetch BASE table data if available. */ + + if (!*exists && is_simulation_allowed) + { + font_obj = unsafe_impl_from_IDWriteFontFace(fontface); + metrics = &font_obj->metrics; + + switch (baseline) + { + case DWRITE_BASELINE_ROMAN: + *baseline_coord = vertical ? metrics->descent : 0; + break; + case DWRITE_BASELINE_CENTRAL: + *baseline_coord = vertical ? (metrics->ascent + metrics->descent) / 2 : + -(metrics->ascent - metrics->descent) / 2; + break; + case DWRITE_BASELINE_MATH: + *baseline_coord = vertical ? (metrics->ascent + metrics->descent) / 2 : + -(metrics->ascent + metrics->descent) / 2; + break; + case DWRITE_BASELINE_HANGING: + /* FIXME: this one isn't accurate, but close. */ + *baseline_coord = vertical ? metrics->capHeight * 6 / 7 + metrics->descent : metrics->capHeight * 6 / 7; + break; + case DWRITE_BASELINE_IDEOGRAPHIC_BOTTOM: + case DWRITE_BASELINE_MINIMUM: + *baseline_coord = vertical ? 0 : metrics->descent; + break; + case DWRITE_BASELINE_IDEOGRAPHIC_TOP: + case DWRITE_BASELINE_MAXIMUM: + *baseline_coord = vertical ? metrics->ascent + metrics->descent : -metrics->ascent; + break; + default: + ; + } + } + + return S_OK; } static HRESULT WINAPI dwritetextanalyzer1_AnalyzeVerticalGlyphOrientation(IDWriteTextAnalyzer2 *iface, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index c5cf0954fe..70becb55ee 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -2484,39 +2484,48 @@ static void test_GetBaseline(void) fontface = create_fontface(); - /* Tahoma doesn't have BASE table, it doesn't work even with simulation enabled */ + /* Tahoma does not have a BASE table. */ + exists = TRUE; baseline = 456; - hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, - fontface, - DWRITE_BASELINE_DEFAULT, - FALSE, - TRUE, - sa, - NULL, - &baseline, - &exists); -todo_wine { - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(baseline == 0, "got %d\n", baseline); - ok(exists == FALSE, "got %d\n", exists); -} + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + exists = TRUE; baseline = 456; - hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, - fontface, - DWRITE_BASELINE_ROMAN, - FALSE, - TRUE, - sa, - NULL, - &baseline, - &exists); -todo_wine { - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(baseline == 0, "got %d\n", baseline); - ok(exists == FALSE, "got %d\n", exists); -} + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT, FALSE, + FALSE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 0; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_CENTRAL, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(baseline != 0, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 0; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_CENTRAL, FALSE, + FALSE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 456; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT + 100, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + IDWriteFontFace_Release(fontface); IDWriteTextAnalyzer1_Release(analyzer1); }

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.142.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: b4310a19e96283e114fad13f7565f912a39640de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4310a19e96283e114fad13f… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Jun 1 12:19:58 2020 -0700 winevulkan: Update to VK spec version 1.2.142. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 16 ++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 6 ++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 241686122c..1dee769836 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.140" +VK_XML_VERSION = "1.2.142" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index a7480bf2da..8811fbbb8a 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1569,6 +1569,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT: + { + const VkDevicePrivateDataCreateInfoEXT *in = (const VkDevicePrivateDataCreateInfoEXT *)in_header; + VkDevicePrivateDataCreateInfoEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->privateDataSlotRequestCount = in->privateDataSlotRequestCount; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2: { const VkPhysicalDeviceFeatures2 *in = (const VkPhysicalDeviceFeatures2 *)in_header; diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 60f2a2fac9..84b47bb610 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.140" + "api_version": "1.2.142" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 513b5ffa85..d419d3f8e4 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -399,14 +399,14 @@ #define VK_QCOM_render_pass_store_ops_EXTENSION_NAME "VK_QCOM_render_pass_store_ops" #define VK_MAKE_VERSION(major, minor, patch) \ - (((major) << 22) | ((minor) << 12) | (patch)) + ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) -#define VK_HEADER_VERSION 140 +#define VK_HEADER_VERSION 142 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; @@ -1135,6 +1135,7 @@ typedef enum VkDriverId VK_DRIVER_ID_GOOGLE_SWIFTSHADER = 10, VK_DRIVER_ID_GGP_PROPRIETARY = 11, VK_DRIVER_ID_BROADCOM_PROPRIETARY = 12, + VK_DRIVER_ID_MESA_LLVMPIPE = 13, VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY, VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE, VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV, @@ -3087,6 +3088,7 @@ typedef enum VkVendorId VK_VENDOR_ID_VSI = 0x00010002, VK_VENDOR_ID_KAZAN = 0x00010003, VK_VENDOR_ID_CODEPLAY = 0x00010004, + VK_VENDOR_ID_MESA = 0x00010005, VK_VENDOR_ID_MAX_ENUM = 0x7fffffff, } VkVendorId;

1 0

Alexandre Julliard : ntdll: Move NtSetContextThread() implementation to the Unix library.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: ac90898f72b02bbc226a95deb40555c1fb8ac3a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac90898f72b02bbc226a95de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 13:11:54 2020 +0200 ntdll: Move NtSetContextThread() implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/signal_arm.c | 72 --------------- dlls/ntdll/signal_arm64.c | 72 --------------- dlls/ntdll/signal_i386.c | 102 --------------------- dlls/ntdll/signal_powerpc.c | 130 -------------------------- dlls/ntdll/signal_x86_64.c | 96 -------------------- dlls/ntdll/thread.c | 10 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/signal_arm.c | 38 ++++++++ dlls/ntdll/unix/signal_arm64.c | 48 ++++++++++ dlls/ntdll/unix/signal_i386.c | 191 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 28 ++++++ dlls/ntdll/unix/signal_x86_64.c | 135 +++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 20 ++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 16 files changed, 474 insertions(+), 474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac90898f72b02bbc226a…

1 0