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

Alexandre Julliard : ntdll: Avoid using the LDT definitions from libwine.
by Alexandre Julliard 01 Apr '20

01 Apr '20

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

Matteo Bruni : d3dx9: Switch character count to unsigned int in the DrawText implementation.
by Alexandre Julliard 01 Apr '20

01 Apr '20

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

Sven Baars : d3dx9: Add a helper for computing the bounding rectangle in ID3DXFont_DrawText.
by Alexandre Julliard 01 Apr '20

01 Apr '20

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 01 Apr '20

01 Apr '20

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

Sven Baars : d3dx9: Handle horizontal alignment in ID3DXFont_DrawText.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: d511853d45bc3302b2a4501b1aa0097a4e78b3d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d511853d45bc3302b2a4501b… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 27 17:48:34 2020 +0100 d3dx9: Handle horizontal 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 | 23 ++++++- dlls/d3dx9_36/tests/core.c | 162 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 182 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d511853d45bc3302b2a4…

1 0

Zebediah Figura : d3dcompiler: Index instructions for liveness ranges.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 443b0e3efda8e35bf2369ee3d2cb0ab8ce08facc URL: https://source.winehq.org/git/wine.git/?a=commit;h=443b0e3efda8e35bf2369ee3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 1 20:31:18 2020 +0200 d3dcompiler: Index instructions for liveness ranges. 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 | 2 + dlls/d3dcompiler_43/hlsl.y | 68 ++++++++++++++++++++++++++++--- dlls/d3dcompiler_43/utils.c | 2 +- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 2a92628212..0dee4129f0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -658,6 +658,7 @@ 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; @@ -734,6 +735,7 @@ struct hlsl_ir_loop struct hlsl_ir_node node; /* loop condition is stored in the body (as "if (!condition) break;") */ struct list *body; + unsigned int next_index; /* liveness index of the end of the loop */ }; enum hlsl_ir_expr_op { diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 4c3e96caa0..a434769462 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -915,6 +915,22 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr return NULL; } +static struct hlsl_ir_function_decl *get_func_entry(const char *name) +{ + struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function *func; + struct wine_rb_entry *entry; + + if ((entry = wine_rb_get(&hlsl_ctx.functions, name))) + { + func = WINE_RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + WINE_RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) + return decl; + } + + return NULL; +} + static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) { list_add_tail(list, &node->entry); @@ -2545,9 +2561,37 @@ static void dump_function(struct wine_rb_entry *entry, void *context) wine_rb_for_each_entry(&func->overloads, dump_function_decl, NULL); } +/* Allocate a unique, ordered index to each instruction, which will be used for + * computing liveness ranges. */ +static unsigned int index_instructions(struct list *instrs, unsigned int index) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + instr->index = index++; + + if (instr->type == HLSL_IR_IF) + { + struct hlsl_ir_if *iff = if_from_node(instr); + index = index_instructions(iff->then_instrs, index); + if (iff->else_instrs) + index = index_instructions(iff->else_instrs, index); + } + else if (instr->type == HLSL_IR_LOOP) + { + index = index_instructions(loop_from_node(instr)->body, index); + loop_from_node(instr)->next_index = index; + } + } + + return index; +} + struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) { + struct hlsl_ir_function_decl *entry_func; struct hlsl_scope *scope, *next_scope; struct hlsl_type *hlsl_type, *next_type; struct hlsl_ir_var *var, *next_var; @@ -2573,12 +2617,6 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino hlsl_parse(); - if (TRACE_ON(hlsl_parser)) - { - TRACE("IR dump.\n"); - wine_rb_for_each_entry(&hlsl_ctx.functions, dump_function, NULL); - } - TRACE("Compilation status = %d\n", hlsl_ctx.status); if (messages) { @@ -2597,6 +2635,24 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino d3dcompiler_free((void *)hlsl_ctx.source_files[i]); d3dcompiler_free(hlsl_ctx.source_files); + if (hlsl_ctx.status == PARSE_ERR) + goto out; + + if (!(entry_func = get_func_entry(entrypoint))) + { + hlsl_message("error: entry point %s is not defined\n", debugstr_a(entrypoint)); + goto out; + } + + index_instructions(entry_func->body, 1); + + if (TRACE_ON(hlsl_parser)) + { + TRACE("IR dump.\n"); + wine_rb_for_each_entry(&hlsl_ctx.functions, dump_function, NULL); + } + +out: TRACE("Freeing functions IR.\n"); wine_rb_destroy(&hlsl_ctx.functions, free_function_rb, NULL); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 6e9bb593e0..84323c334f 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2156,7 +2156,7 @@ static void debug_dump_ir_loop(const struct hlsl_ir_loop *loop) static void debug_dump_instr(const struct hlsl_ir_node *instr) { - wine_dbg_printf("%p: ", instr); + wine_dbg_printf("%4u: %p: ", instr->index, instr); switch (instr->type) { case HLSL_IR_EXPR:

1 0

Zebediah Figura : d3dcompiler: Compute liveness ranges for variables.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 2738e5d2b8ed7d6ec44a88edd1ce76591a4cbac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2738e5d2b8ed7d6ec44a88ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 29 21:53:17 2020 -0500 d3dcompiler: Compute liveness ranges for variables. 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 | 2 +- dlls/d3dcompiler_43/hlsl.y | 90 ++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 0dee4129f0..e1cdd9a8ba 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -700,7 +700,7 @@ struct hlsl_ir_var const struct reg_reservation *reg_reservation; struct list scope_entry, param_entry; - struct hlsl_var_allocation *allocation; + unsigned int first_write, last_read; }; struct hlsl_ir_function diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index a434769462..14f94c04cd 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -21,6 +21,7 @@ %{ #include "wine/debug.h" +#include <limits.h> #include <stdio.h> #include "d3dcompiler_private.h" @@ -2588,6 +2589,90 @@ static unsigned int index_instructions(struct list *instrs, unsigned int index) return index; } +/* Walk the chain of derefs and retrieve the actual variable we care about. */ +static struct hlsl_ir_var *hlsl_var_from_deref(const struct hlsl_deref *deref) +{ + switch (deref->type) + { + case HLSL_IR_DEREF_VAR: + return deref->v.var; + case HLSL_IR_DEREF_ARRAY: + return hlsl_var_from_deref(&deref_from_node(deref->v.array.array)->src); + case HLSL_IR_DEREF_RECORD: + return hlsl_var_from_deref(&deref_from_node(deref->v.record.record)->src); + } + assert(0); + return NULL; +} + +/* 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. */ +static void compute_liveness_recurse(struct list *instrs, unsigned int loop_first, unsigned int loop_last) +{ + struct hlsl_ir_node *instr; + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_ASSIGNMENT: + { + struct hlsl_ir_assignment *assignment = assignment_from_node(instr); + var = hlsl_var_from_deref(&assignment->lhs); + if (!var->first_write) + var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; + break; + } + case HLSL_IR_DEREF: + { + 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; + break; + } + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = if_from_node(instr); + compute_liveness_recurse(iff->then_instrs, loop_first, loop_last); + if (iff->else_instrs) + compute_liveness_recurse(iff->else_instrs, loop_first, loop_last); + break; + } + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = loop_from_node(instr); + compute_liveness_recurse(loop->body, loop_first ? loop_first : instr->index, + loop_last ? loop_last : loop->next_index); + break; + } + default: + break; + } + } +} + +static void compute_liveness(struct hlsl_ir_function_decl *entry_func) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &hlsl_ctx.globals->vars, struct hlsl_ir_var, scope_entry) + { + var->first_write = 1; + } + + LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) + { + if (var->modifiers & HLSL_STORAGE_IN) + var->first_write = 1; + if (var->modifiers & HLSL_STORAGE_OUT) + var->last_read = UINT_MAX; + } + + compute_liveness_recurse(entry_func->body, 0, 0); +} + struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) { @@ -2644,7 +2729,8 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino goto out; } - index_instructions(entry_func->body, 1); + /* Index 0 means unused; index 1 means function entry, so start at 2. */ + index_instructions(entry_func->body, 2); if (TRACE_ON(hlsl_parser)) { @@ -2652,6 +2738,8 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino wine_rb_for_each_entry(&hlsl_ctx.functions, dump_function, NULL); } + compute_liveness(entry_func); + out: TRACE("Freeing functions IR.\n"); wine_rb_destroy(&hlsl_ctx.functions, free_function_rb, NULL);

1 0

Zebediah Figura : d3dcompiler: Compute liveness ranges for anonymous nodes.
by Alexandre Julliard 01 Apr '20

01 Apr '20

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

Dmitry Timoshkov : activeds: Make IADsPathname::Set() and IADsPathname::Retrieve() return success.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: ba82c34b1b01a592ea01cd8399c4346f1e8f42b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba82c34b1b01a592ea01cd83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 1 18:18:37 2020 +0800 activeds: Make IADsPathname::Set() and IADsPathname::Retrieve() return success. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 63b86ab778..52a94cbb18 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -39,6 +39,7 @@ typedef struct { IADsPathname IADsPathname_iface; LONG ref; + BSTR adspath; } Pathname; static inline Pathname *impl_from_IADsPathname(IADsPathname *iface) @@ -112,10 +113,16 @@ static HRESULT WINAPI path_Invoke(IADsPathname *iface, DISPID dispid, REFIID rii return E_NOTIMPL; } -static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR path, LONG type) +static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) { - FIXME("%p,%s,%d: stub\n", iface, debugstr_w(path), type); - return E_NOTIMPL; + Pathname *path = impl_from_IADsPathname(iface); + + FIXME("%p,%s,%d: stub\n", iface, debugstr_w(adspath), type); + + if (!adspath) return E_INVALIDARG; + + path->adspath = SysAllocString(adspath); + return path->adspath ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) @@ -124,10 +131,16 @@ static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) return E_NOTIMPL; } -static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *path) +static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspath) { - FIXME("%p,%d,%p: stub\n", iface, type, path); - return E_NOTIMPL; + Pathname *path = impl_from_IADsPathname(iface); + + FIXME("%p,%d,%p: stub\n", iface, type, adspath); + + if (!adspath) return E_INVALIDARG; + + *adspath = SysAllocString(path->adspath); + return *adspath ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) @@ -210,6 +223,7 @@ static HRESULT Pathname_create(REFIID riid, void **obj) path->IADsPathname_iface.lpVtbl = &IADsPathname_vtbl; path->ref = 1; + path->adspath = NULL; hr = IADsPathname_QueryInterface(&path->IADsPathname_iface, riid, obj); IADsPathname_Release(&path->IADsPathname_iface);

1 0

Dmitry Timoshkov : adsldp: Add IDirectoryObject stubs.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 59c7e1977cd2d53c6ee755641073e15e075093de URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c7e1977cd2d53c6ee75564… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 1 18:18:39 2020 +0800 adsldp: Add IDirectoryObject stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/iads.idl | 35 +++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c4557667cc..9a3ac63407 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -383,6 +383,7 @@ typedef struct IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; IDirectorySearch IDirectorySearch_iface; + IDirectoryObject IDirectoryObject_iface; LONG ref; LDAP *ld; BSTR host; @@ -445,6 +446,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectoryObject)) + { + IADs_AddRef(iface); + *obj = &ldap->IDirectoryObject_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1558,6 +1566,86 @@ static const IDirectorySearchVtbl IDirectorySearch_vtbl = search_CloseSearchHandle }; +static inline LDAP_namespace *impl_from_IDirectoryObject(IDirectoryObject *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IDirectoryObject_iface); +} + +static HRESULT WINAPI dirobj_QueryInterface(IDirectoryObject *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IDirectoryObject) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IDirectoryObject_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI dirobj_AddRef(IDirectoryObject *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectoryObject(iface); + return IADs_AddRef(&ldap->IADs_iface); +} + +static ULONG WINAPI dirobj_Release(IDirectoryObject *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectoryObject(iface); + return IADs_Release(&ldap->IADs_iface); +} + +static HRESULT WINAPI dirobj_GetObjectInformation(IDirectoryObject *iface, PADS_OBJECT_INFO *info) +{ + FIXME("%p,%p: stub\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_GetObjectAttributes(IDirectoryObject *iface, LPWSTR *names, + DWORD count, PADS_ATTR_INFO *attrs, DWORD *count_returned) +{ + FIXME("%p,%p,%u,%p,%p: stub\n", iface, names, count, attrs, count_returned); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_SetObjectAttributes(IDirectoryObject *iface, PADS_ATTR_INFO attrs, + DWORD count, DWORD *count_set) +{ + FIXME("%p,%p,%u,%p: stub\n", iface, attrs, count, count_set); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_CreateDSObject(IDirectoryObject *iface, LPWSTR name, + PADS_ATTR_INFO attrs, DWORD count, IDispatch **obj) +{ + FIXME("%p,%s,%p,%u,%p: stub\n", iface, debugstr_w(name), attrs, count, obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_DeleteDSObject(IDirectoryObject *iface, LPWSTR name) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(name)); + return E_NOTIMPL; +} + +static const IDirectoryObjectVtbl IDirectoryObject_vtbl = +{ + dirobj_QueryInterface, + dirobj_AddRef, + dirobj_Release, + dirobj_GetObjectInformation, + dirobj_GetObjectAttributes, + dirobj_SetObjectAttributes, + dirobj_CreateDSObject, + dirobj_DeleteDSObject +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -1569,6 +1657,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->IDirectorySearch_iface.lpVtbl = &IDirectorySearch_vtbl; + ldap->IDirectoryObject_iface.lpVtbl = &IDirectoryObject_vtbl; ldap->ref = 1; ldap->ld = NULL; ldap->host = NULL; diff --git a/include/iads.idl b/include/iads.idl index c9d1687524..b04ed0846a 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -344,6 +344,24 @@ typedef struct ads_search_column HANDLE hReserved; } ADS_SEARCH_COLUMN, *PADS_SEARCH_COLUMN; +typedef struct _ads_object_info +{ + LPWSTR pszRDN; + LPWSTR pszObjectDN; + LPWSTR pszParentDN; + LPWSTR pszSchemaDN; + LPWSTR pszClassName; +} ADS_OBJECT_INFO, *PADS_OBJECT_INFO; + +typedef struct _ads_attr_info +{ + LPWSTR pszAttrName; + DWORD dwControlCode; + ADSTYPE dwADsType; + PADSVALUE pADsValues; + DWORD dwNumValues; +} ADS_ATTR_INFO, *PADS_ATTR_INFO; + /***************************************************************************** * IADsContainer interface */ @@ -799,6 +817,23 @@ interface IDirectorySearch : IUnknown HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } +/***************************************************************************** + * IDirectoryObject interface + */ +[ + odl, + local, + uuid(e798de2c-22e4-11d0-84fe-00c04fd8d503) +] +interface IDirectoryObject : IUnknown +{ + HRESULT GetObjectInformation(PADS_OBJECT_INFO *info); + HRESULT GetObjectAttributes(LPWSTR *names, DWORD count, PADS_ATTR_INFO *attrs, DWORD *count_returned); + HRESULT SetObjectAttributes(PADS_ATTR_INFO attrs, DWORD count, DWORD *count_set); + HRESULT CreateDSObject(LPWSTR name, PADS_ATTR_INFO attrs, DWORD count, IDispatch **obj); + HRESULT DeleteDSObject(LPWSTR name); +} + /***************************************************************************** * IID_IADsOpenDSObject interface */

1 0