April 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : d3dcompiler: Compute liveness ranges for anonymous nodes.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 0340b0b044b8c058f4cd751f495fa3e0cd126e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0340b0b044b8c058f4cd751f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 29 21:53:18 2020 -0500 d3dcompiler: Compute liveness ranges for anonymous nodes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 7 +++++- dlls/d3dcompiler_43/hlsl.y | 41 ++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index e1cdd9a8ba..df45a7082f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -658,10 +658,15 @@ struct hlsl_ir_node { struct list entry; enum hlsl_ir_node_type type; - unsigned int index; /* for liveness ranges */ struct hlsl_type *data_type; struct source_location loc; + + /* Liveness ranges. "index" is the index of this instruction. Since this is + * essentially an SSA value, the earliest live point is the index. This is + * true even for loops, since currently we can't have a reference to a + * value generated in an earlier iteration of the loop. */ + unsigned int index, last_read; }; #define HLSL_STORAGE_EXTERN 0x00000001 diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 14f94c04cd..67393f6ca9 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -2607,7 +2607,9 @@ static struct hlsl_ir_var *hlsl_var_from_deref(const struct hlsl_deref *deref) /* Compute the earliest and latest liveness for each variable. In the case that * a variable is accessed inside of a loop, we promote its liveness to extend - * to at least the range of the entire loop. */ + * to at least the range of the entire loop. Note that we don't need to do this + * for anonymous nodes, since there's currently no way to use a node which was + * calculated in an earlier iteration of the loop. */ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_first, unsigned int loop_last) { struct hlsl_ir_node *instr; @@ -2623,6 +2625,17 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs var = hlsl_var_from_deref(&assignment->lhs); if (!var->first_write) var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; + assignment->rhs->last_read = instr->index; + break; + } + case HLSL_IR_CONSTANT: + break; + case HLSL_IR_CONSTRUCTOR: + { + struct hlsl_ir_constructor *constructor = constructor_from_node(instr); + unsigned int i; + for (i = 0; i < constructor->args_count; ++i) + constructor->args[i]->last_read = instr->index; break; } case HLSL_IR_DEREF: @@ -2630,6 +2643,18 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs struct hlsl_ir_deref *deref = deref_from_node(instr); var = hlsl_var_from_deref(&deref->src); var->last_read = loop_last ? max(instr->index, loop_last) : instr->index; + if (deref->src.type == HLSL_IR_DEREF_ARRAY) + deref->src.v.array.index->last_read = instr->index; + break; + } + case HLSL_IR_EXPR: + { + struct hlsl_ir_expr *expr = expr_from_node(instr); + expr->operands[0]->last_read = instr->index; + if (expr->operands[1]) + expr->operands[1]->last_read = instr->index; + if (expr->operands[2]) + expr->operands[2]->last_read = instr->index; break; } case HLSL_IR_IF: @@ -2638,6 +2663,14 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs compute_liveness_recurse(iff->then_instrs, loop_first, loop_last); if (iff->else_instrs) compute_liveness_recurse(iff->else_instrs, loop_first, loop_last); + iff->condition->last_read = instr->index; + break; + } + case HLSL_IR_JUMP: + { + struct hlsl_ir_jump *jump = jump_from_node(instr); + if (jump->type == HLSL_IR_JUMP_RETURN && jump->return_value) + jump->return_value->last_read = instr->index; break; } case HLSL_IR_LOOP: @@ -2647,6 +2680,12 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs loop_last ? loop_last : loop->next_index); break; } + case HLSL_IR_SWIZZLE: + { + struct hlsl_ir_swizzle *swizzle = swizzle_from_node(instr); + swizzle->val->last_read = instr->index; + break; + } default: break; }

1 0

Alexandre Julliard : ntdll: Implement NtSetLdtEntries().
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 01873109662eb7f5879eb72fdf1f55bbdaef0329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01873109662eb7f5879eb72f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:33:37 2020 +0200 ntdll: Implement NtSetLdtEntries(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 12 ----- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 9 ++++ dlls/ntdll/signal_arm64.c | 9 ++++ dlls/ntdll/signal_i386.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/signal_powerpc.c | 9 ++++ dlls/ntdll/signal_x86_64.c | 9 ++++ include/winternl.h | 2 +- 8 files changed, 148 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01873109662eb7f5879e…

1 0

Alexandre Julliard : ntdll: Reimplement LDT support for the TEB selector.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: b644034a52360abba3726a28729eac0ff009fdd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b644034a52360abba3726a28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:35:11 2020 +0200 ntdll: Reimplement LDT support for the TEB selector. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 113 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 99 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 60f4637e2d..b4e2d15e98 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -569,6 +569,14 @@ static inline int is_gdt_sel( WORD sel ) return !(sel & 4); } +/*********************************************************************** + * ldt_is_system + */ +static inline int ldt_is_system( WORD sel ) +{ + return is_gdt_sel( sel ) || ((sel >> 3) < first_ldt_entry); +} + /*********************************************************************** * dispatch_signal */ @@ -893,8 +901,7 @@ static inline void *init_handler( const ucontext_t *sigcontext, WORD *fs, WORD * } #endif - if (!wine_ldt_is_system(CS_sig(sigcontext)) || - !wine_ldt_is_system(SS_sig(sigcontext))) /* 16-bit mode */ + if (!ldt_is_system(CS_sig(sigcontext)) || !ldt_is_system(SS_sig(sigcontext))) /* 16-bit mode */ { /* * Win16 or DOS protected mode. Note that during switch @@ -1580,7 +1587,7 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) BYTE instr[16]; unsigned int i, len, prefix_count = 0; - if (!wine_ldt_is_system( context->SegCs )) return 0; + if (!ldt_is_system( context->SegCs )) return 0; len = virtual_uninterrupted_read_memory( (BYTE *)context->Eip, instr, sizeof(instr) ); for (i = 0; i < len; i++) switch (instr[i]) @@ -1647,7 +1654,7 @@ static inline BOOL check_invalid_gs( ucontext_t *sigcontext, CONTEXT *context ) WORD system_gs = x86_thread_data()->gs; if (context->SegGs == system_gs) return FALSE; - if (!wine_ldt_is_system( context->SegCs )) return FALSE; + if (!ldt_is_system( context->SegCs )) return FALSE; /* only handle faults in system libraries */ if (virtual_is_valid_code_address( instr, 1 )) return FALSE; @@ -2069,7 +2076,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.NumberParameters = 2; stack->rec.ExceptionInformation[0] = 0; /* if error contains a LDT selector, use that as fault address */ - if ((err & 7) == 4 && !wine_ldt_is_system( err | 7 )) + if ((err & 7) == 4 && !ldt_is_system( err | 7 )) stack->rec.ExceptionInformation[1] = err & ~7; else { @@ -2291,6 +2298,11 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /*********************************************************************** * LDT support */ + +#define LDT_SIZE 8192 + +static WORD gdt_fs_sel; + static RTL_CRITICAL_SECTION ldt_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { @@ -2384,6 +2396,83 @@ static void ldt_set_entry( WORD sel, LDT_ENTRY entry ) WINE_LDT_FLAGS_ALLOCATED); } +static void ldt_init(void) +{ +#ifdef __linux__ + /* the preloader may have allocated it already */ + gdt_fs_sel = wine_get_fs(); + if (!gdt_fs_sel || !is_gdt_sel( gdt_fs_sel )) + { + struct modify_ldt_s ldt_info = { -1 }; + + ldt_info.seg_32bit = 1; + ldt_info.usable = 1; + if (set_thread_area( &ldt_info ) >= 0) gdt_fs_sel = (ldt_info.entry_number << 3) | 3; + else gdt_fs_sel = 0; + } +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) + gdt_fs_sel = GSEL( GUFS_SEL, SEL_UPL ); +#endif +} + +WORD ldt_alloc_fs( TEB *teb, int first_thread ) +{ + LDT_ENTRY entry; + int idx; + + if (gdt_fs_sel) return gdt_fs_sel; + + entry = ldt_make_entry( teb, teb_size - 1, WINE_LDT_FLAGS_DATA | WINE_LDT_FLAGS_32BIT ); + + if (first_thread) /* no locking for first thread */ + { + /* leave some space if libc is using the LDT for %gs */ + if (!is_gdt_sel( wine_get_gs() )) first_ldt_entry = 512; + idx = first_ldt_entry; + ldt_set_entry( (idx << 3) | 7, entry ); + } + else + { + ldt_lock(); + for (idx = first_ldt_entry; idx < LDT_SIZE; idx++) + { + if (wine_ldt_copy.flags[idx]) continue; + ldt_set_entry( (idx << 3) | 7, entry ); + break; + } + ldt_unlock(); + if (idx == LDT_SIZE) return 0; + } + return (idx << 3) | 7; +} + +static void ldt_free_fs( WORD sel ) +{ + if (sel == gdt_fs_sel) return; + + ldt_lock(); + wine_ldt_copy.flags[sel >> 3] = 0; + ldt_unlock(); +} + +static void ldt_set_fs( WORD sel, TEB *teb ) +{ + if (sel == gdt_fs_sel) + { +#ifdef __linux__ + struct modify_ldt_s ldt_info = { sel >> 3 }; + + ldt_info.base_addr = teb; + ldt_info.limit = teb_size - 1; + ldt_info.seg_32bit = 1; + if (set_thread_area( &ldt_info ) < 0) perror( "set_thread_area" ); +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) + i386_set_fsbase( teb ); +#endif + } + wine_set_fs( sel ); +} + /********************************************************************** * get_thread_ldt_entry @@ -2462,6 +2551,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) SIZE_T size; void *addr = NULL; NTSTATUS status; + int first_thread = !sigstack_alignment; if (!sigstack_alignment) { @@ -2471,6 +2561,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; signal_stack_mask = (1 << sigstack_alignment) - 1; signal_stack_size = (1 << sigstack_alignment) - teb_size; + ldt_init(); } size = signal_stack_mask + 1; @@ -2481,7 +2572,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; thread_data = (struct x86_thread_data *)(*teb)->SystemReserved2; - if (!(thread_data->fs = wine_ldt_alloc_fs())) + if (!(thread_data->fs = ldt_alloc_fs( *teb, first_thread ))) { size = 0; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); @@ -2500,7 +2591,7 @@ void signal_free_thread( TEB *teb ) SIZE_T size = 0; struct x86_thread_data *thread_data = (struct x86_thread_data *)teb->SystemReserved2; - wine_ldt_free_fs( thread_data->fs ); + ldt_free_fs( thread_data->fs ); NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } @@ -2512,7 +2603,6 @@ void signal_init_thread( TEB *teb ) { const WORD fpu_cw = 0x27f; struct x86_thread_data *thread_data = (struct x86_thread_data *)teb->SystemReserved2; - LDT_ENTRY fs_entry; stack_t ss; #ifdef __APPLE__ @@ -2528,10 +2618,7 @@ void signal_init_thread( TEB *teb ) ss.ss_flags = 0; if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); - wine_ldt_set_base( &fs_entry, teb ); - wine_ldt_set_limit( &fs_entry, teb_size - 1 ); - wine_ldt_set_flags( &fs_entry, WINE_LDT_FLAGS_DATA|WINE_LDT_FLAGS_32BIT ); - wine_ldt_init_fs( thread_data->fs, &fs_entry ); + ldt_set_fs( thread_data->fs, teb ); thread_data->gs = wine_get_gs(); #ifdef __GNUC__ @@ -2579,8 +2666,6 @@ void signal_init_process(void) sig_act.sa_sigaction = trap_handler; if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif - - wine_ldt_init_locking( ldt_lock, ldt_unlock ); return; error:

1 0

Alexandre Julliard : ntdll: Avoid using the LDT definitions from libwine.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: b8f0e32b9f00f63abee6ca31e190ff794c053b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f0e32b9f00f63abee6ca31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:41:05 2020 +0200 ntdll: Avoid using the LDT definitions from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 54 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b4e2d15e98..e812f634ff 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2301,6 +2301,11 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) #define LDT_SIZE 8192 +#define LDT_FLAGS_DATA 0x13 /* Data segment */ +#define LDT_FLAGS_CODE 0x1b /* Code segment */ +#define LDT_FLAGS_32BIT 0x40 /* Segment is 32-bit (code or stack) */ +#define LDT_FLAGS_ALLOCATED 0x80 /* Segment is allocated */ + static WORD gdt_fs_sel; static RTL_CRITICAL_SECTION ldt_section; @@ -2335,13 +2340,36 @@ static void ldt_unlock(void) else RtlLeaveCriticalSection( &ldt_section ); } +static inline void *ldt_get_base( LDT_ENTRY ent ) +{ + return (void *)(ent.BaseLow | + (ULONG_PTR)ent.HighWord.Bits.BaseMid << 16 | + (ULONG_PTR)ent.HighWord.Bits.BaseHi << 24); +} + +static inline unsigned int ldt_get_limit( LDT_ENTRY ent ) +{ + unsigned int limit = ent.LimitLow | (ent.HighWord.Bits.LimitHi << 16); + if (ent.HighWord.Bits.Granularity) limit = (limit << 12) | 0xfff; + return limit; +} + static LDT_ENTRY ldt_make_entry( void *base, unsigned int limit, unsigned char flags ) { LDT_ENTRY entry; - wine_ldt_set_base( &entry, base ); - wine_ldt_set_limit( &entry, limit ); - wine_ldt_set_flags( &entry, flags ); + entry.BaseLow = (WORD)(ULONG_PTR)base; + entry.HighWord.Bits.BaseMid = (BYTE)((ULONG_PTR)base >> 16); + entry.HighWord.Bits.BaseHi = (BYTE)((ULONG_PTR)base >> 24); + if ((entry.HighWord.Bits.Granularity = (limit >= 0x100000))) limit >>= 12; + entry.LimitLow = (WORD)limit; + entry.HighWord.Bits.LimitHi = limit >> 16; + entry.HighWord.Bits.Dpl = 3; + entry.HighWord.Bits.Pres = 1; + entry.HighWord.Bits.Type = flags; + entry.HighWord.Bits.Sys = 0; + entry.HighWord.Bits.Reserved_0 = 0; + entry.HighWord.Bits.Default_Big = (flags & LDT_FLAGS_32BIT) != 0; return entry; } @@ -2352,7 +2380,7 @@ static void ldt_set_entry( WORD sel, LDT_ENTRY entry ) #ifdef linux struct modify_ldt_s ldt_info = { index }; - ldt_info.base_addr = wine_ldt_get_base( &entry ); + ldt_info.base_addr = ldt_get_base( entry ); ldt_info.limit = entry.LimitLow | (entry.HighWord.Bits.LimitHi << 16); ldt_info.seg_32bit = entry.HighWord.Bits.Default_Big; ldt_info.contents = (entry.HighWord.Bits.Type >> 2) & 3; @@ -2374,7 +2402,7 @@ static void ldt_set_entry( WORD sel, LDT_ENTRY entry ) struct ssd ldt_mod; ldt_mod.sel = sel; - ldt_mod.bo = (unsigned long)wine_ldt_get_base(&entry); + ldt_mod.bo = (unsigned long)ldt_get_base( entry ); ldt_mod.ls = entry.LimitLow | (entry.HighWord.Bits.LimitHi << 16); ldt_mod.acc1 = entry.HighWord.Bytes.Flags1; ldt_mod.acc2 = entry.HighWord.Bytes.Flags2 >> 4; @@ -2389,11 +2417,11 @@ static void ldt_set_entry( WORD sel, LDT_ENTRY entry ) exit(1); #endif - wine_ldt_copy.base[index] = wine_ldt_get_base( &entry ); - wine_ldt_copy.limit[index] = wine_ldt_get_limit( &entry ); + wine_ldt_copy.base[index] = ldt_get_base( entry ); + wine_ldt_copy.limit[index] = ldt_get_limit( entry ); wine_ldt_copy.flags[index] = (entry.HighWord.Bits.Type | - (entry.HighWord.Bits.Default_Big ? WINE_LDT_FLAGS_32BIT : 0) | - WINE_LDT_FLAGS_ALLOCATED); + (entry.HighWord.Bits.Default_Big ? LDT_FLAGS_32BIT : 0) | + LDT_FLAGS_ALLOCATED); } static void ldt_init(void) @@ -2422,7 +2450,7 @@ WORD ldt_alloc_fs( TEB *teb, int first_thread ) if (gdt_fs_sel) return gdt_fs_sel; - entry = ldt_make_entry( teb, teb_size - 1, WINE_LDT_FLAGS_DATA | WINE_LDT_FLAGS_32BIT ); + entry = ldt_make_entry( teb, teb_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); if (first_thread) /* no locking for first thread */ { @@ -2490,11 +2518,11 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ if (!(info->Selector & ~3)) info->Entry = null_entry; else if ((info->Selector | 3) == wine_get_cs()) - info->Entry = ldt_make_entry( 0, ~0u, WINE_LDT_FLAGS_CODE | WINE_LDT_FLAGS_32BIT ); + info->Entry = ldt_make_entry( 0, ~0u, LDT_FLAGS_CODE | LDT_FLAGS_32BIT ); else if ((info->Selector | 3) == wine_get_ds()) - info->Entry = ldt_make_entry( 0, ~0u, WINE_LDT_FLAGS_DATA | WINE_LDT_FLAGS_32BIT ); + info->Entry = ldt_make_entry( 0, ~0u, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); else if ((info->Selector | 3) == wine_get_fs()) - info->Entry = ldt_make_entry( NtCurrentTeb(), 0xfff, WINE_LDT_FLAGS_DATA | WINE_LDT_FLAGS_32BIT ); + info->Entry = ldt_make_entry( NtCurrentTeb(), 0xfff, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); else return STATUS_UNSUCCESSFUL; }

1 0

Sven Baars : d3dx9: Add a helper for computing the bounding rectangle in ID3DXFont_DrawText.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 53769e7bde9cfb808e26cf67057314c2ca03345a URL: https://source.winehq.org/git/wine.git/?a=commit;h=53769e7bde9cfb808e26cf67… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Apr 1 20:27:13 2020 +0200 d3dx9: Add a helper for computing the bounding rectangle in ID3DXFont_DrawText. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 154 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 63 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index ebbda69580..603c7c25a1 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -599,17 +599,46 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count, return NULL; } +static int compute_rect(struct d3dx_font *font, const WCHAR *string, unsigned int count, + WCHAR *line, RECT *rect, DWORD format) +{ + int y, lh, width, top = rect->top; + int max_width = 0; + SIZE size; + + y = rect->top; + lh = font->metrics.tmHeight; + width = rect->right - rect->left; + + while (string) + { + unsigned int line_len; + + string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size); + + if (size.cx > max_width) + max_width = size.cx; + + y += lh; + if (!(format & DT_NOCLIP) && (y > rect->bottom)) + break; + } + + rect->right = rect->left + max_width; + rect->bottom = y; + + return rect->bottom - top; +} + static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, const WCHAR *string, INT in_count, RECT *rect, DWORD format, D3DCOLOR color) { struct d3dx_font *font = impl_from_ID3DXFont(iface); + int lh, x, y, width, top, ret = 0; ID3DXSprite *target = sprite; - RECT textrect = {0}; - int lh, x, y, width; unsigned int count; - int max_width = 0; + RECT r = {0}; WCHAR *line; - int ret = 0; SIZE size; TRACE("iface %p, sprite %p, string %s, in_count %d, rect %s, format %#x, color 0x%08x.\n", @@ -629,20 +658,36 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, if (format & DT_SINGLELINE) format &= ~DT_WORDBREAK; - if (rect) - textrect = *rect; - - x = textrect.left; - y = textrect.top; - width = textrect.right - textrect.left; - - lh = font->metrics.tmHeight; - line = heap_alloc(count * sizeof(*line)); if (!line) return 0; - if (!(format & DT_CALCRECT) && !sprite) + if (!rect || format & DT_CALCRECT) + { + if (!rect) + { + rect = &r; + format |= DT_NOCLIP; + } + + top = rect->top; + + ret = compute_rect(font, string, count, line, rect, format); + + if (format & DT_CALCRECT) + goto cleanup; + } + else + { + top = rect->top; + } + + x = rect->left; + y = rect->top; + lh = font->metrics.tmHeight; + width = rect->right - rect->left; + + if (!sprite) { D3DXCreateSprite(font->device, &target); ID3DXSprite_Begin(target, 0); @@ -650,72 +695,55 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, while (string) { - unsigned int line_len; + unsigned int line_len, i; + GCP_RESULTSW results; + D3DXVECTOR3 pos; string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size); - if (!(format & DT_CALCRECT)) - { - GCP_RESULTSW results; - D3DXVECTOR3 pos; - unsigned int i; - - memset(&results, 0, sizeof(results)); - results.nGlyphs = line_len; + memset(&results, 0, sizeof(results)); + results.nGlyphs = line_len; - results.lpCaretPos = heap_alloc(line_len * sizeof(*results.lpCaretPos)); - if (!results.lpCaretPos) - goto cleanup; + results.lpCaretPos = heap_alloc(line_len * sizeof(*results.lpCaretPos)); + if (!results.lpCaretPos) + goto cleanup; - results.lpGlyphs = heap_alloc(line_len * sizeof(*results.lpGlyphs)); - if (!results.lpGlyphs) - { - heap_free(results.lpCaretPos); - goto cleanup; - } - - GetCharacterPlacementW(font->hdc, line, line_len, 0, &results, 0); + results.lpGlyphs = heap_alloc(line_len * sizeof(*results.lpGlyphs)); + if (!results.lpGlyphs) + { + heap_free(results.lpCaretPos); + goto cleanup; + } - for (i = 0; i < results.nGlyphs; ++i) - { - IDirect3DTexture9 *texture; - POINT cell_inc; - RECT black_box; + GetCharacterPlacementW(font->hdc, line, line_len, 0, &results, 0); - ID3DXFont_GetGlyphData(iface, results.lpGlyphs[i], &texture, &black_box, &cell_inc); + for (i = 0; i < results.nGlyphs; ++i) + { + IDirect3DTexture9 *texture; + POINT cell_inc; + RECT black_box; - if (!texture) - continue; + ID3DXFont_GetGlyphData(iface, results.lpGlyphs[i], &texture, &black_box, &cell_inc); - pos.x = cell_inc.x + x + results.lpCaretPos[i]; - pos.y = cell_inc.y + y; + if (!texture) + continue; - ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); - IDirect3DTexture9_Release(texture); - } + pos.x = cell_inc.x + x + results.lpCaretPos[i]; + pos.y = cell_inc.y + y; - heap_free(results.lpCaretPos); - heap_free(results.lpGlyphs); - } - else if (size.cx > max_width) - { - max_width = size.cx; + ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); + IDirect3DTexture9_Release(texture); } + heap_free(results.lpCaretPos); + heap_free(results.lpGlyphs); + y += lh; - if (!(DT_NOCLIP & format) && (y > textrect.bottom)) + if (!(DT_NOCLIP & format) && (y > rect->bottom)) break; } - if (format & DT_CALCRECT && rect) - { - *rect = textrect; - - rect->bottom = y; - rect->right = rect->left + max_width; - } - - ret = y - textrect.top; + ret = y - top; cleanup: if (target != sprite)

1 0

Sven Baars : d3dx9: Handle vertical alignment in ID3DXFont_DrawText.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: fd9808b45af4bf4c6771fe2932e3169cb193bf44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd9808b45af4bf4c6771fe29… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 27 17:48:33 2020 +0100 d3dx9: Handle vertical alignment in ID3DXFont_DrawText. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 21 ++++++- dlls/d3dx9_36/tests/core.c | 152 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 169 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd9808b45af4bf4c6771…

1 0

Jacek Caban : dbghelp: Don't store entire mach header in image_file_map.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 7254579417f337063734933975b25d21da4d31f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7254579417f3370637349339… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 20:27:59 2020 +0200 dbghelp: Don't store entire mach header in image_file_map. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 5 +++-- dlls/dbghelp/macho_module.c | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 2b414b9607..9f015c2707 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -94,10 +94,11 @@ struct image_file_map size_t segs_start; HANDLE handle; struct image_file_map* dsym; /* the debug symbols file associated with this one */ + size_t header_size; /* size of real header in file */ + size_t commands_size; + size_t commands_count; #ifdef HAVE_MACH_O_LOADER_H - struct mach_header mach_header; - size_t header_size; /* size of real header in file */ const struct load_command* load_commands; const struct uuid_command* uuid; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1e01d84c19..5d3f8615e8 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -448,7 +448,7 @@ static const struct load_command* macho_map_load_commands(struct macho_file_map* if (fmap->load_commands == IMAGE_NO_MAP) { fmap->load_commands = (const struct load_command*) macho_map_range( - fmap, fmap->header_size, fmap->mach_header.sizeofcmds, NULL); + fmap, fmap->header_size, fmap->commands_size, NULL); TRACE("Mapped load commands: %p\n", fmap->load_commands); } @@ -466,7 +466,7 @@ static void macho_unmap_load_commands(struct macho_file_map* fmap) { TRACE("Unmapping load commands: %p\n", fmap->load_commands); macho_unmap_range(NULL, (const void**)&fmap->load_commands, fmap, - fmap->header_size, fmap->mach_header.sizeofcmds); + fmap->header_size, fmap->commands_size); } } @@ -504,9 +504,9 @@ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, if ((lc = macho_map_load_commands(fmap)) == IMAGE_NO_MAP) return -1; - TRACE("%d total commands\n", fmap->mach_header.ncmds); + TRACE("%lu total commands\n", fmap->commands_count); - for (i = 0; i < fmap->mach_header.ncmds; i++, lc = macho_next_load_command(lc)) + for (i = 0; i < fmap->commands_count; i++, lc = macho_next_load_command(lc)) { int result; @@ -683,6 +683,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, { struct macho_file_map* fmap = &ifm->u.macho; struct fat_header fat_header; + struct mach_header mach_header; int i; WCHAR* filename; struct section_info info; @@ -745,15 +746,16 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, /* Individual architecture (standalone or within a fat file) is in its native byte order. */ SetFilePointer(fmap->handle, fmap->arch_offset, 0, FILE_BEGIN); - if (!ReadFile(fmap->handle, &fmap->mach_header, sizeof(fmap->mach_header), &bytes_read, NULL) - || bytes_read != sizeof(fmap->mach_header)) + if (!ReadFile(fmap->handle, &mach_header, sizeof(mach_header), &bytes_read, NULL) + || bytes_read != sizeof(mach_header)) goto done; TRACE("... got possible Mach header\n"); /* and check for a Mach-O header */ - if (fmap->mach_header.magic != target_magic || - fmap->mach_header.cputype != target_cpu) goto done; + if (mach_header.magic != target_magic || mach_header.cputype != target_cpu) goto done; + fmap->commands_size = mach_header.sizeofcmds; + fmap->commands_count = mach_header.ncmds; /* Make sure the file type is one of the ones we expect. */ - switch (fmap->mach_header.filetype) + switch (mach_header.filetype) { case MH_EXECUTE: case MH_DYLIB:

1 0

Jacek Caban : dbghelp: Use local macho load command declaration.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: c695e7e99e0a06b6039d46f98fea35c363aa6cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c695e7e99e0a06b6039d46f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 20:28:10 2020 +0200 dbghelp: Use local macho load command declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 19 ++++++++++++++++--- dlls/dbghelp/macho_module.c | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 9f015c2707..da977c08f5 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -63,6 +63,19 @@ struct elf_section_header UINT64 sh_entsize; /* Entry size if section holds table */ }; +struct macho_load_command +{ + UINT32 cmd; /* type of load command */ + UINT32 cmdsize; /* total size of command in bytes */ +}; + +struct macho_uuid_command +{ + UINT32 cmd; /* LC_UUID */ + UINT32 cmdsize; + UINT8 uuid[16]; +}; + /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings */ @@ -98,14 +111,14 @@ struct image_file_map size_t commands_size; size_t commands_count; -#ifdef HAVE_MACH_O_LOADER_H - const struct load_command* load_commands; - const struct uuid_command* uuid; + const struct macho_load_command* load_commands; + const struct macho_uuid_command* uuid; /* The offset in the file which is this architecture. mach_header was * read from arch_offset. */ unsigned arch_offset; +#ifdef HAVE_MACH_O_LOADER_H int num_sections; struct { diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 5d3f8615e8..ac4e8cbb7e 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -443,11 +443,11 @@ static const struct image_file_map_ops macho_file_map_ops = * * Maps the load commands from a Mach-O file into memory */ -static const struct load_command* macho_map_load_commands(struct macho_file_map* fmap) +static const struct macho_load_command* macho_map_load_commands(struct macho_file_map* fmap) { if (fmap->load_commands == IMAGE_NO_MAP) { - fmap->load_commands = (const struct load_command*) macho_map_range( + fmap->load_commands = (const struct macho_load_command*) macho_map_range( fmap, fmap->header_size, fmap->commands_size, NULL); TRACE("Mapped load commands: %p\n", fmap->load_commands); } @@ -475,9 +475,9 @@ static void macho_unmap_load_commands(struct macho_file_map* fmap) * * Advance to the next load command */ -static const struct load_command* macho_next_load_command(const struct load_command* lc) +static const struct macho_load_command* macho_next_load_command(const struct macho_load_command* lc) { - return (const struct load_command*)((const char*)lc + lc->cmdsize); + return (const struct macho_load_command*)((const char*)lc + lc->cmdsize); } /****************************************************************** @@ -492,11 +492,11 @@ static const struct load_command* macho_next_load_command(const struct load_comm * processed. */ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, - int (*cb)(struct image_file_map*, const struct load_command*, void*), + int (*cb)(struct image_file_map*, const struct macho_load_command*, void*), void* user) { struct macho_file_map* fmap = &ifm->u.macho; - const struct load_command* lc; + const struct macho_load_command* lc; int i; int count = 0; @@ -528,7 +528,7 @@ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, * significant sections in a Mach-O file. All commands are * expected to be of LC_SEGMENT[_64] type. */ -static int macho_count_sections(struct image_file_map* ifm, const struct load_command* lc, void* user) +static int macho_count_sections(struct image_file_map* ifm, const struct macho_load_command* lc, void* user) { char segname[16]; uint32_t nsects; @@ -560,7 +560,7 @@ static int macho_count_sections(struct image_file_map* ifm, const struct load_co * range covered by the segments of a Mach-O file and builds the * section map. All commands are expected to be of LC_SEGMENT[_64] type. */ -static int macho_load_section_info(struct image_file_map* ifm, const struct load_command* lc, void* user) +static int macho_load_section_info(struct image_file_map* ifm, const struct macho_load_command* lc, void* user) { struct macho_file_map* fmap = &ifm->u.macho; struct section_info* info = user; @@ -652,9 +652,9 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct load * Callback for macho_enum_load_commands. Records the UUID load * command of a Mach-O file. */ -static int find_uuid(struct image_file_map* ifm, const struct load_command* lc, void* user) +static int find_uuid(struct image_file_map* ifm, const struct macho_load_command* lc, void* user) { - ifm->u.macho.uuid = (const struct uuid_command*)lc; + ifm->u.macho.uuid = (const struct macho_uuid_command*)lc; return 1; } @@ -927,7 +927,7 @@ static void macho_stabs_def_cb(struct module* module, ULONG_PTR load_offset, * load commands from the Mach-O file. */ static int macho_parse_symtab(struct image_file_map* ifm, - const struct load_command* lc, void* user) + const struct macho_load_command* lc, void* user) { struct macho_file_map* fmap = &ifm->u.macho; const struct symtab_command* sc = (const struct symtab_command*)lc;

1 0

Jacek Caban : dbghelp: Use local macho section declaration.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 64341284c58bcc22f13f8146bcb6c8a08c0c4ff2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64341284c58bcc22f13f8146… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 20:28:32 2020 +0200 dbghelp: Use local macho section declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 45 +++++++++++++++++++++++++++++++------------- dlls/dbghelp/macho_module.c | 4 ++-- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index da977c08f5..4171b38923 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -19,16 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef HAVE_LINK_H -# include <link.h> -#endif -#ifdef HAVE_SYS_LINK_H -# include <sys/link.h> -#endif -#ifdef HAVE_MACH_O_LOADER_H -#include <mach-o/loader.h> -#endif - #define IMAGE_NO_MAP ((void*)-1) struct elf_header @@ -76,6 +66,37 @@ struct macho_uuid_command UINT8 uuid[16]; }; +struct macho_section +{ + char sectname[16]; /* name of this section */ + char segname[16]; /* segment this section goes in */ + UINT64 addr; /* memory address of this section */ + UINT64 size; /* size in bytes of this section */ + UINT32 offset; /* file offset of this section */ + UINT32 align; /* section alignment (power of 2) */ + UINT32 reloff; /* file offset of relocation entries */ + UINT32 nreloc; /* number of relocation entries */ + UINT32 flags; /* flags (section type and attributes)*/ + UINT32 reserved1; /* reserved (for offset or index) */ + UINT32 reserved2; /* reserved (for count or sizeof) */ + UINT32 reserved3; /* reserved */ +}; + +struct macho_section32 +{ + char sectname[16]; /* name of this section */ + char segname[16]; /* segment this section goes in */ + UINT32 addr; /* memory address of this section */ + UINT32 size; /* size in bytes of this section */ + UINT32 offset; /* file offset of this section */ + UINT32 align; /* section alignment (power of 2) */ + UINT32 reloff; /* file offset of relocation entries */ + UINT32 nreloc; /* number of relocation entries */ + UINT32 flags; /* flags (section type and attributes)*/ + UINT32 reserved1; /* reserved (for offset or index) */ + UINT32 reserved2; /* reserved (for count or sizeof) */ +}; + /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings */ @@ -118,15 +139,13 @@ struct image_file_map * read from arch_offset. */ unsigned arch_offset; -#ifdef HAVE_MACH_O_LOADER_H int num_sections; struct { - struct section_64 section; + struct macho_section section; const char* mapped; unsigned int ignored : 1; }* sect; -#endif } macho; struct pe_file_map { diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ac4e8cbb7e..0e532c354b 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -624,7 +624,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct mach { if (ifm->addr_size == 32) { - const struct section *section = &((const struct section *)sections)[i]; + const struct macho_section32 *section = &((const struct macho_section32 *)sections)[i]; memcpy(fmap->sect[info->section_index].section.sectname, section->sectname, sizeof(section->sectname)); memcpy(fmap->sect[info->section_index].section.segname, section->segname, sizeof(section->segname)); fmap->sect[info->section_index].section.addr = section->addr; @@ -636,7 +636,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct mach fmap->sect[info->section_index].section.flags = section->flags; } else - fmap->sect[info->section_index].section = ((const struct section_64 *)sections)[i]; + fmap->sect[info->section_index].section = ((const struct macho_section *)sections)[i]; fmap->sect[info->section_index].mapped = IMAGE_NO_MAP; fmap->sect[info->section_index].ignored = ignore;

1 0

Matteo Bruni : d3dx9: Switch character count to unsigned int in the DrawText implementation.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: b5df43b9118074485a1f4a917b16d37bc068839d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5df43b9118074485a1f4a91… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 1 20:27:12 2020 +0200 d3dx9: Switch character count to unsigned int in the DrawText implementation. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 54b1574bb1..ebbda69580 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -552,11 +552,11 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, heap_free(sla); } -static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, +static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count, WCHAR *dest, unsigned int *dest_len, int width, DWORD format, SIZE *size) { + unsigned int orig_count = *count; unsigned int i = 0; - int orig_count = *count; int num_fit; *dest_len = 0; @@ -600,25 +600,25 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, } static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, - const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) + const WCHAR *string, INT in_count, RECT *rect, DWORD format, D3DCOLOR color) { struct d3dx_font *font = impl_from_ID3DXFont(iface); ID3DXSprite *target = sprite; - WCHAR *line; RECT textrect = {0}; int lh, x, y, width; + unsigned int count; int max_width = 0; + WCHAR *line; int ret = 0; SIZE size; - TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x.\n", - iface, sprite, debugstr_wn(string, count), count, wine_dbgstr_rect(rect), format, color); + TRACE("iface %p, sprite %p, string %s, in_count %d, rect %s, format %#x, color 0x%08x.\n", + iface, sprite, debugstr_wn(string, in_count), in_count, wine_dbgstr_rect(rect), format, color); if (!string) return 0; - if (count < 0) - count = lstrlenW(string); + count = in_count < 0 ? lstrlenW(string) : in_count; if (!count) return 0;

1 0