May 2021 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Forbid declaring variables as both "uniform" and "static".
by Alexandre Julliard 14 May '21

14 May '21

Module: vkd3d Branch: master Commit: 07fb4ea1aee6a57941a901f80fd2722427297f11 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=07fb4ea1aee6a57941a901f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 10 23:36:05 2021 -0500 vkd3d-shader: Forbid declaring variables as both "uniform" and "static". Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9eef5e2..2c9fe55 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1423,6 +1423,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t { local = false; + if ((modifiers & HLSL_STORAGE_UNIFORM) && (modifiers & HLSL_STORAGE_STATIC)) + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Variable '%s' is declared as both \"uniform\" and \"static\".", var->name); + if ((func = hlsl_get_func_decl(ctx, var->name))) { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED,

1 0

Zebediah Figura : tests: Add some tests for HLSL storage qualifiers.
by Alexandre Julliard 14 May '21

14 May '21

Module: vkd3d Branch: master Commit: 4d4aeb9bb4a77ec6ec3c1eb92680a6dfc9d30439 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4d4aeb9bb4a77ec6ec3c1eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 10 23:36:06 2021 -0500 tests: Add some tests for HLSL storage qualifiers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-invalid.shader_test | 60 +++++++++++++++++++++++++++++++ tests/hlsl-storage-qualifiers.shader_test | 20 +++++++++++ 3 files changed, 82 insertions(+) diff --git a/Makefile.am b/Makefile.am index 542b66e..e853786 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,6 +64,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ + tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -261,6 +262,7 @@ XFAIL_TESTS = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ + tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 0711d26..7205598 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -121,6 +121,12 @@ float4 main(in float4 i) : sv_target return 0; } +[pixel shader fail] +float4 main(float4 i) : sv_target +{ + return 0; +} + [pixel shader fail] struct {float4 a;}; @@ -159,3 +165,57 @@ void main(out struct output o) o.t = float4(0, 0, 0, 0); o.a = 0; } + +[pixel shader fail] +uniform in float4 f; +float4 main() : sv_target { return 0; } + +[pixel shader fail] +in float4 f; +float4 main() : sv_target { return 0; } + +[pixel shader fail] +static uniform float4 f; +float4 main() : sv_target { return 0; } + +[pixel shader fail] +void main(out uniform float4 o : sv_target) +{ + o = 0; +} + +[pixel shader fail] +void sub(out uniform float4 o) +{ + o = 0; +} + +void main(out float4 o : sv_target) +{ + sub(o); +} + +[pixel shader fail] +void sub(in out uniform float4 o) +{ +} + +void main(out float4 o : sv_target) +{ + o = 0; + sub(o); +} + +[pixel shader fail] +float4 main(void) : sv_target +{ + uniform float f; + return 0; +} + +[pixel shader fail] +float4 main(void) : sv_target +{ + in float f; + return 0; +} diff --git a/tests/hlsl-storage-qualifiers.shader_test b/tests/hlsl-storage-qualifiers.shader_test new file mode 100644 index 0000000..0e22bb6 --- /dev/null +++ b/tests/hlsl-storage-qualifiers.shader_test @@ -0,0 +1,20 @@ +[pixel shader] +void sub2(in uniform float4 i, out float4 o) +{ + o = i; +} + +void sub(float a, uniform float b, in float c, uniform in float d, out float4 o) +{ + sub2(float4(a, b, c, d), o); +} + +void main(in uniform float a, uniform float b, out float4 o : sv_target) +{ + sub(a, b, 0.3, 0.4, o); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4)

1 0

Zebediah Figura : vkd3d-shader: Write SM1 semantic declarations.
by Alexandre Julliard 14 May '21

14 May '21

Module: vkd3d Branch: master Commit: db849f2b4507d7ef15d5d87eb4ec969034387729 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=db849f2b4507d7ef15d5d87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 10 23:36:07 2021 -0500 vkd3d-shader: Write SM1 semantic declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d9types.h | 32 +++++++++++ libs/vkd3d-shader/hlsl_codegen.c | 114 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 145 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_d3d9types.h b/include/vkd3d_d3d9types.h index 1f88644..c204202 100644 --- a/include/vkd3d_d3d9types.h +++ b/include/vkd3d_d3d9types.h @@ -29,6 +29,10 @@ #define D3DSI_INSTLENGTH_SHIFT 24 +#define D3DSP_DCL_USAGE_SHIFT 0 +#define D3DSP_DCL_USAGEINDEX_SHIFT 16 +#define D3DSP_DSTMOD_SHIFT 20 + #define D3DSP_REGTYPE_SHIFT 28 #define D3DSP_REGTYPE_SHIFT2 8 #define D3DSP_REGTYPE_MASK (0x7 << D3DSP_REGTYPE_SHIFT) @@ -43,6 +47,24 @@ #define D3DPS_VERSION(major, minor) (0xffff0000 | ((major) << 8) | (minor)) #define D3DVS_VERSION(major, minor) (0xfffe0000 | ((major) << 8) | (minor)) +typedef enum _D3DDECLUSAGE +{ + D3DDECLUSAGE_POSITION = 0x0, + D3DDECLUSAGE_BLENDWEIGHT = 0x1, + D3DDECLUSAGE_BLENDINDICES = 0x2, + D3DDECLUSAGE_NORMAL = 0x3, + D3DDECLUSAGE_PSIZE = 0x4, + D3DDECLUSAGE_TEXCOORD = 0x5, + D3DDECLUSAGE_TANGENT = 0x6, + D3DDECLUSAGE_BINORMAL = 0x7, + D3DDECLUSAGE_TESSFACTOR = 0x8, + D3DDECLUSAGE_POSITIONT = 0x9, + D3DDECLUSAGE_COLOR = 0xa, + D3DDECLUSAGE_FOG = 0xb, + D3DDECLUSAGE_DEPTH = 0xc, + D3DDECLUSAGE_SAMPLE = 0xd, +} D3DDECLUSAGE; + typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { D3DSIO_NOP = 0x00, @@ -136,6 +158,16 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE D3DSIO_FORCE_DWORD = 0x7fffffff, } D3DSHADER_INSTRUCTION_OPCODE_TYPE; +typedef enum _D3DSHADER_PARAM_DSTMOD_TYPE +{ + D3DSPDM_NONE = 0 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_SATURATE = 1 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_PARTIALPRECISION = 2 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_MSAMPCENTROID = 4 << D3DSP_DSTMOD_SHIFT, + + D3DSPDM_FORCE_DWORD = 0x7fffffff, +} D3DSHADER_PARAM_DSTMOD_TYPE; + typedef enum _D3DSHADER_PARAM_REGISTER_TYPE { D3DSPR_TEMP = 0x00, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9f2c278..d499511 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1013,6 +1013,49 @@ static bool sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_s return false; } +static bool sm1_usage_from_semantic(const struct hlsl_semantic *semantic, D3DDECLUSAGE *usage, uint32_t *usage_idx) +{ + static const struct + { + const char *name; + D3DDECLUSAGE usage; + } + semantics[] = + { + {"binormal", D3DDECLUSAGE_BINORMAL}, + {"blendindices", D3DDECLUSAGE_BLENDINDICES}, + {"blendweight", D3DDECLUSAGE_BLENDWEIGHT}, + {"color", D3DDECLUSAGE_COLOR}, + {"depth", D3DDECLUSAGE_DEPTH}, + {"fog", D3DDECLUSAGE_FOG}, + {"normal", D3DDECLUSAGE_NORMAL}, + {"position", D3DDECLUSAGE_POSITION}, + {"positiont", D3DDECLUSAGE_POSITIONT}, + {"psize", D3DDECLUSAGE_PSIZE}, + {"sample", D3DDECLUSAGE_SAMPLE}, + {"sv_depth", D3DDECLUSAGE_DEPTH}, + {"sv_position", D3DDECLUSAGE_POSITION}, + {"sv_target", D3DDECLUSAGE_COLOR}, + {"tangent", D3DDECLUSAGE_TANGENT}, + {"tessfactor", D3DDECLUSAGE_TESSFACTOR}, + {"texcoord", D3DDECLUSAGE_TEXCOORD}, + }; + + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(semantics); ++i) + { + if (!ascii_strcasecmp(semantic->name, semantics[i].name)) + { + *usage = semantics[i].usage; + *usage_idx = semantic->index; + return true; + } + } + + return false; +} + static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int *counter, bool output) { assert(var->semantic.name); @@ -1020,7 +1063,15 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if (ctx->profile->major_version < 4) { D3DSHADER_PARAM_REGISTER_TYPE type; - unsigned int reg; + uint32_t reg, usage_idx; + D3DDECLUSAGE usage; + + if (!sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, + "Invalid semantic '%s'.", var->semantic.name); + return; + } if (!sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg)) { @@ -1371,6 +1422,12 @@ static uint32_t sm1_encode_register_type(D3DSHADER_PARAM_REGISTER_TYPE type) | ((type << D3DSP_REGTYPE_SHIFT2) & D3DSP_REGTYPE_MASK2); } +static uint32_t sm1_encode_dst(D3DSHADER_PARAM_REGISTER_TYPE type, + D3DSHADER_PARAM_DSTMOD_TYPE modifier, unsigned int writemask, unsigned int reg) +{ + return (1u << 31) | sm1_encode_register_type(type) | modifier | (writemask << 16) | reg; +} + static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) { unsigned int i, x; @@ -1393,6 +1450,60 @@ static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer } } +static void write_sm1_semantic_dcl(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, + const struct hlsl_ir_var *var, bool output) +{ + D3DSHADER_PARAM_REGISTER_TYPE type; + uint32_t token, usage_idx, reg_idx; + D3DDECLUSAGE usage; + bool ret; + + if (sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg_idx)) + { + usage = 0; + usage_idx = 0; + } + else + { + ret = sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx); + assert(ret); + type = output ? D3DSPR_OUTPUT : D3DSPR_INPUT; + reg_idx = var->reg.id; + } + + token = D3DSIO_DCL; + if (ctx->profile->major_version > 1) + token |= 2 << D3DSI_INSTLENGTH_SHIFT; + put_dword(buffer, token); + + token = (1u << 31); + token |= usage << D3DSP_DCL_USAGE_SHIFT; + token |= usage_idx << D3DSP_DCL_USAGEINDEX_SHIFT; + put_dword(buffer, token); + put_dword(buffer, sm1_encode_dst(type, D3DSPDM_NONE, (1 << var->data_type->dimx) - 1, reg_idx)); +} + +static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) +{ + bool write_in = false, write_out = false; + struct hlsl_ir_var *var; + + if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) + write_in = true; + else if (ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX && ctx->profile->major_version == 3) + write_in = write_out = true; + else if (ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX && ctx->profile->major_version < 3) + write_in = true; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (write_in && var->is_input_semantic) + write_sm1_semantic_dcl(ctx, buffer, var, false); + if (write_out && var->is_output_semantic) + write_sm1_semantic_dcl(ctx, buffer, var, true); + } +} + static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { @@ -1404,6 +1515,7 @@ static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl * write_sm1_uniforms(ctx, &buffer, entry_func); write_sm1_constant_defs(ctx, &buffer); + write_sm1_semantic_dcls(ctx, &buffer); put_dword(&buffer, D3DSIO_END);

1 0

Zebediah Figura : vkd3d-shader: Write SM1 store instructions.
by Alexandre Julliard 14 May '21

14 May '21

Module: vkd3d Branch: master Commit: e23780301163e073495319fcdcba4f8e0021ba78 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e23780301163e073495319f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 10 23:36:08 2021 -0500 vkd3d-shader: Write SM1 store instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d9types.h | 22 ++++ libs/vkd3d-shader/hlsl_codegen.c | 220 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 242 insertions(+) diff --git a/include/vkd3d_d3d9types.h b/include/vkd3d_d3d9types.h index c204202..75d0461 100644 --- a/include/vkd3d_d3d9types.h +++ b/include/vkd3d_d3d9types.h @@ -33,6 +33,8 @@ #define D3DSP_DCL_USAGEINDEX_SHIFT 16 #define D3DSP_DSTMOD_SHIFT 20 +#define D3DSP_SRCMOD_SHIFT 24 + #define D3DSP_REGTYPE_SHIFT 28 #define D3DSP_REGTYPE_SHIFT2 8 #define D3DSP_REGTYPE_MASK (0x7 << D3DSP_REGTYPE_SHIFT) @@ -196,6 +198,26 @@ typedef enum _D3DSHADER_PARAM_REGISTER_TYPE D3DSPR_FORCE_DWORD = 0x7fffffff, } D3DSHADER_PARAM_REGISTER_TYPE; +typedef enum _D3DSHADER_PARAM_SRCMOD_TYPE +{ + D3DSPSM_NONE = 0x0 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_NEG = 0x1 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_BIAS = 0x2 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_BIASNEG = 0x3 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_SIGN = 0x4 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_SIGNNEG = 0x5 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_COMP = 0x6 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_X2 = 0x7 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_X2NEG = 0x8 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_DZ = 0x9 << D3DSP_SRCMOD_SHIFT, + D3DSPSM_DW = 0xa << D3DSP_SRCMOD_SHIFT, + D3DSPSM_ABS = 0xb << D3DSP_SRCMOD_SHIFT, + D3DSPSM_ABSNEG = 0xc << D3DSP_SRCMOD_SHIFT, + D3DSPSM_NOT = 0xd << D3DSP_SRCMOD_SHIFT, + + D3DSPSM_FORCE_DWORD = 0x7fffffff, +} D3DSHADER_PARAM_SRCMOD_TYPE; + typedef enum _D3DSHADER_MISCTYPE_OFFSETS { D3DSMO_POSITION = 0x0, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d499511..0dfbfb9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1097,6 +1097,101 @@ static void allocate_semantic_registers(struct hlsl_ctx *ctx) } } +static unsigned int map_swizzle(unsigned int swizzle, unsigned int writemask) +{ + unsigned int i, ret = 0; + + for (i = 0; i < 4; ++i) + { + if (writemask & (1 << i)) + { + ret |= (swizzle & 3) << (i * 2); + swizzle >>= 2; + } + } + return ret; +} + +static unsigned int swizzle_from_writemask(unsigned int writemask) +{ + static const unsigned int swizzles[16] = + { + 0, + HLSL_SWIZZLE(X, X, X, X), + HLSL_SWIZZLE(Y, Y, Y, Y), + HLSL_SWIZZLE(X, Y, X, X), + HLSL_SWIZZLE(Z, Z, Z, Z), + HLSL_SWIZZLE(X, Z, X, X), + HLSL_SWIZZLE(Y, Z, X, X), + HLSL_SWIZZLE(X, Y, Z, X), + HLSL_SWIZZLE(W, W, W, W), + HLSL_SWIZZLE(X, W, X, X), + HLSL_SWIZZLE(Y, W, X, X), + HLSL_SWIZZLE(X, Y, W, X), + HLSL_SWIZZLE(Z, W, X, X), + HLSL_SWIZZLE(X, Z, W, X), + HLSL_SWIZZLE(Y, Z, W, X), + HLSL_SWIZZLE(X, Y, Z, W), + }; + + return swizzles[writemask & 0xf]; +} + +static unsigned int combine_writemasks(unsigned int first, unsigned int second) +{ + unsigned int ret = 0, i, j = 0; + + for (i = 0; i < 4; ++i) + { + if (first & (1 << i)) + { + if (second & (1 << j++)) + ret |= (1 << i); + } + } + + return ret; +} + +static bool type_is_single_reg(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; +} + +static struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct hlsl_type *type) +{ + struct hlsl_ir_node *offset_node = deref->offset.node; + const struct hlsl_ir_var *var = deref->var; + struct hlsl_reg ret = {0}; + unsigned int offset = 0; + + if (offset_node && offset_node->type != HLSL_IR_CONSTANT) + { + FIXME("Dereference with non-constant offset of type %s.\n", hlsl_node_type_to_string(offset_node->type)); + return ret; + } + + ret = var->reg; + + ret.allocated = var->reg.allocated; + ret.id = var->reg.id; + if (offset_node) + offset = hlsl_ir_constant(offset_node)->value.u[0]; + ret.id += offset / 4; + + if (type_is_single_reg(var->data_type)) + { + assert(!offset); + ret.writemask = var->reg.writemask; + } + else + { + assert(type_is_single_reg(type)); + ret.writemask = ((1 << type->dimx) - 1) << (offset & 3); + } + return ret; +} + struct bytecode_buffer { uint32_t *data; @@ -1428,6 +1523,57 @@ static uint32_t sm1_encode_dst(D3DSHADER_PARAM_REGISTER_TYPE type, return (1u << 31) | sm1_encode_register_type(type) | modifier | (writemask << 16) | reg; } +static uint32_t sm1_encode_src(D3DSHADER_PARAM_REGISTER_TYPE type, + D3DSHADER_PARAM_SRCMOD_TYPE modifier, unsigned int swizzle, uint32_t reg) +{ + return (1u << 31) | sm1_encode_register_type(type) | modifier | (swizzle << 16) | reg; +} + +struct sm1_instruction +{ + D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode; + + struct + { + D3DSHADER_PARAM_REGISTER_TYPE type; + D3DSHADER_PARAM_DSTMOD_TYPE mod; + unsigned int writemask; + uint32_t reg; + } dst; + + struct + { + D3DSHADER_PARAM_REGISTER_TYPE type; + D3DSHADER_PARAM_SRCMOD_TYPE mod; + unsigned int swizzle; + uint32_t reg; + } srcs[2]; + unsigned int src_count; + + unsigned int has_dst; +}; + +static void write_sm1_instruction(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, + const struct sm1_instruction *instr) +{ + uint32_t token = instr->opcode; + unsigned int i; + + if (ctx->profile->major_version > 1) + token |= (instr->has_dst + instr->src_count) << D3DSI_INSTLENGTH_SHIFT; + put_dword(buffer, token); + + if (instr->has_dst) + { + assert(instr->dst.writemask); + put_dword(buffer, sm1_encode_dst(instr->dst.type, instr->dst.mod, instr->dst.writemask, instr->dst.reg)); + } + + for (i = 0; i < instr->src_count; ++i) + put_dword(buffer, sm1_encode_src(instr->srcs[i].type, instr->srcs[i].mod, + map_swizzle(instr->srcs[i].swizzle, instr->dst.writemask), instr->srcs[i].reg)); +}; + static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) { unsigned int i, x; @@ -1504,6 +1650,79 @@ static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct bytecode_buffer } } +static void write_sm1_store(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) +{ + const struct hlsl_ir_store *store = hlsl_ir_store(instr); + const struct hlsl_ir_node *rhs = store->rhs.node; + const struct hlsl_reg reg = hlsl_reg_from_deref(&store->lhs, rhs->data_type); + struct sm1_instruction sm1_instr = + { + .opcode = D3DSIO_MOV, + + .dst.type = D3DSPR_TEMP, + .dst.reg = reg.id, + .dst.writemask = combine_writemasks(reg.writemask, store->writemask), + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].reg = rhs->reg.id, + .srcs[0].swizzle = swizzle_from_writemask(rhs->reg.writemask), + .src_count = 1, + }; + + if (store->lhs.var->data_type->type == HLSL_CLASS_MATRIX) + { + FIXME("Matrix writemasks need to be lowered.\n"); + return; + } + + if (store->lhs.var->is_output_semantic) + { + if (!sm1_register_from_semantic(ctx, &store->lhs.var->semantic, true, &sm1_instr.dst.type, &sm1_instr.dst.reg)) + { + assert(reg.allocated); + sm1_instr.dst.type = D3DSPR_OUTPUT; + sm1_instr.dst.reg = reg.id; + } + else + sm1_instr.dst.writemask = (1u << store->lhs.var->data_type->dimx) - 1; + } + else + assert(reg.allocated); + + write_sm1_instruction(ctx, buffer, &sm1_instr); +} + +static void write_sm1_instructions(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, + const struct hlsl_ir_function_decl *entry_func) +{ + const struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, entry_func->body, struct hlsl_ir_node, entry) + { + if (instr->data_type) + { + if (instr->data_type->type == HLSL_CLASS_MATRIX) + { + FIXME("Matrix operations need to be lowered.\n"); + break; + } + + assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); + } + + switch (instr->type) + { + case HLSL_IR_STORE: + write_sm1_store(ctx, buffer, instr); + break; + + default: + FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); + } + } +} + static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { @@ -1516,6 +1735,7 @@ static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl * write_sm1_constant_defs(ctx, &buffer); write_sm1_semantic_dcls(ctx, &buffer); + write_sm1_instructions(ctx, &buffer, entry_func); put_dword(&buffer, D3DSIO_END);

1 0

Francois Gouget : winetest/build-patterns: Add a testtext CSS class.
by Alexandre Julliard 14 May '21

14 May '21

Module: tools Branch: master Commit: 57c5fec113c83f60f1413f6c2a4c107daa664f86 URL: https://source.winehq.org/git/tools.git/?a=commit;h=57c5fec113c83f60f1413f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 14 11:39:40 2021 +0200 winetest/build-patterns: Add a testtext CSS class. It is needed to maintain a 4 pixel space between the description and the englobing testfile box. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- winetest/report.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index c9fcb66..06d527f 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1074,7 +1074,7 @@ sub write_pattern($$$) compute_set_colors($test->{colors}); - print $html $test->{desc} if (defined $test->{desc}); + print $html "<div class='testtext'>$test->{desc}</div>\n" if (defined $test->{desc}); print $html "<div class='test'>\n"; write_newmodes_line($html, $test) if (%{$test->{newmodes}}); diff --git a/winetest/report.css b/winetest/report.css index 4c91972..f789808 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -28,6 +28,12 @@ div.output, div.test { margin: 0; } +div.testtext { + text-align: left; + padding: 0 0 0 4px; + margin: 0; +} + div.updownbar { padding: 4px; margin-bottom: 5px;

1 0

Alexandre Julliard : ntdll/tests: Don't skip all tests if a function is missing.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: d1e90e15376e87071fce80a17c207affe30aa551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e90e15376e87071fce80a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 13 12:46:14 2021 +0200 ntdll/tests: Don't skip all tests if a function is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index bca2086fee9..cc159f8cca2 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -68,7 +68,6 @@ static inline DWORD_PTR get_affinity_mask(DWORD num_cpus) p ## func = (void*)GetProcAddress(hntdll, #func); \ if(!p ## func) { \ trace("GetProcAddress(%s) failed\n", #func); \ - return FALSE; \ } \ } while(0) @@ -77,13 +76,14 @@ static inline DWORD_PTR get_affinity_mask(DWORD num_cpus) #define FIRM 0x4649524D #define RSMB 0x52534D42 -static BOOL InitFunctionPtrs(void) +static void InitFunctionPtrs(void) { /* All needed functions are NT based, so using GetModuleHandle is a good check */ HMODULE hntdll = GetModuleHandleA("ntdll"); HMODULE hkernel32 = GetModuleHandleA("kernel32"); NTDLL_GET_PROC(NtQuerySystemInformation); + NTDLL_GET_PROC(NtQuerySystemInformationEx); NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); NTDLL_GET_PROC(RtlWow64GetCpuAreaInfo); @@ -105,24 +105,14 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtQueryObject); NTDLL_GET_PROC(NtCreateDebugObject); NTDLL_GET_PROC(NtSetInformationDebugObject); + NTDLL_GET_PROC(NtGetCurrentProcessorNumber); NTDLL_GET_PROC(DbgUiConvertStateChangeStructure); - /* not present before XP */ - pNtGetCurrentProcessorNumber = (void *) GetProcAddress(hntdll, "NtGetCurrentProcessorNumber"); - pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; pGetSystemDEPPolicy = (void *)GetProcAddress(hkernel32, "GetSystemDEPPolicy"); - - /* starting with Win7 */ - pNtQuerySystemInformationEx = (void *) GetProcAddress(hntdll, "NtQuerySystemInformationEx"); - if (!pNtQuerySystemInformationEx) - win_skip("NtQuerySystemInformationEx() is not supported, some tests will be skipped.\n"); - pGetLogicalProcessorInformationEx = (void *) GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); - - return TRUE; } static void test_query_basic(void)

1 0

Alexandre Julliard : ntdll/tests: Add tests for Wow64 TEB and PEB information.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: c2be6ecf0b206d443f5ca2e40cfaaf7f1faca3ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2be6ecf0b206d443f5ca2e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 13 12:50:54 2021 +0200 ntdll/tests: Add tests for Wow64 TEB and PEB information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index cc159f8cca2..ef565873c97 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3125,6 +3125,95 @@ static void test_thread_info(void) static void test_wow64(void) { + PROCESS_BASIC_INFORMATION proc_info; + THREAD_BASIC_INFORMATION info; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + NTSTATUS status; + void *redir; + SIZE_T res; + TEB teb; + + Wow64DisableWow64FsRedirection( &redir ); + + if (CreateProcessA( "C:\\windows\\syswow64\\notepad.exe", NULL, NULL, NULL, + FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi )) + { + memset( &info, 0xcc, sizeof(info) ); + status = pNtQueryInformationThread( pi.hThread, ThreadBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "ThreadBasicInformation failed %x\n", status ); + if (!ReadProcessMemory( pi.hProcess, info.TebBaseAddress, &teb, sizeof(teb), &res )) res = 0; + ok( res == sizeof(teb), "wrong len %lx\n", res ); + todo_wine_if( sizeof(void *) > sizeof(int) ) + ok( teb.Tib.Self == info.TebBaseAddress, "wrong teb %p / %p\n", teb.Tib.Self, info.TebBaseAddress ); + if (is_wow64) + { + ok( !!teb.GdiBatchCount, "GdiBatchCount not set\n" ); + ok( (char *)info.TebBaseAddress + teb.WowTebOffset == ULongToPtr(teb.GdiBatchCount) || + broken(!NtCurrentTeb()->WowTebOffset), /* pre-win10 */ + "wrong teb offset %d\n", teb.WowTebOffset ); + } + else + { + ok( !teb.GdiBatchCount, "GdiBatchCount set\n" ); + todo_wine + ok( teb.WowTebOffset == 0x2000 || + broken( !teb.WowTebOffset || teb.WowTebOffset == 1 ), /* pre-win10 */ + "wrong teb offset %d\n", teb.WowTebOffset ); + todo_wine + ok( (char *)teb.Tib.ExceptionList == (char *)info.TebBaseAddress + 0x2000, + "wrong Tib.ExceptionList %p / %p\n", + (char *)teb.Tib.ExceptionList, (char *)info.TebBaseAddress + 0x2000 ); + } + + status = pNtQueryInformationProcess( pi.hProcess, ProcessBasicInformation, + &proc_info, sizeof(proc_info), NULL ); + ok( !status, "ProcessBasicInformation failed %x\n", status ); + todo_wine_if( sizeof(void *) > sizeof(int) ) + ok( proc_info.PebBaseAddress == teb.Peb, "wrong peb %p / %p\n", proc_info.PebBaseAddress, teb.Peb ); + + TerminateProcess( pi.hProcess, 0 ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + + if (CreateProcessA( "C:\\windows\\system32\\notepad.exe", NULL, NULL, NULL, + FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi )) + { + memset( &info, 0xcc, sizeof(info) ); + status = pNtQueryInformationThread( pi.hThread, ThreadBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "ThreadBasicInformation failed %x\n", status ); + if (!is_wow64) + { + if (!ReadProcessMemory( pi.hProcess, info.TebBaseAddress, &teb, sizeof(teb), &res )) res = 0; + ok( res == sizeof(teb), "wrong len %lx\n", res ); + ok( teb.Tib.Self == info.TebBaseAddress, "wrong teb %p / %p\n", + teb.Tib.Self, info.TebBaseAddress ); + ok( !teb.GdiBatchCount, "GdiBatchCount set\n" ); + ok( !teb.WowTebOffset || broken( teb.WowTebOffset == 1 ), /* vista */ + "wrong teb offset %d\n", teb.WowTebOffset ); + } + else todo_wine ok( !info.TebBaseAddress, "got teb %p\n", info.TebBaseAddress ); + + status = pNtQueryInformationProcess( pi.hProcess, ProcessBasicInformation, + &proc_info, sizeof(proc_info), NULL ); + ok( !status, "ProcessBasicInformation failed %x\n", status ); + if (is_wow64) + todo_wine + ok( !proc_info.PebBaseAddress || + broken( (char *)proc_info.PebBaseAddress >= (char *)0x7f000000 ), /* vista */ + "wrong peb %p\n", proc_info.PebBaseAddress ); + else + ok( proc_info.PebBaseAddress == teb.Peb, "wrong peb %p / %p\n", + proc_info.PebBaseAddress, teb.Peb ); + + TerminateProcess( pi.hProcess, 0 ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + + Wow64RevertWow64FsRedirection( redir ); + #ifdef _WIN64 if (pRtlWow64GetCpuAreaInfo) { @@ -3326,8 +3415,7 @@ START_TEST(info) char **argv; int argc; - if(!InitFunctionPtrs()) - return; + InitFunctionPtrs(); argc = winetest_get_mainargs(&argv); if (argc >= 3) return; /* Child */

1 0

Alexandre Julliard : server: Send TEB and PEB in the process_init_done request.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: d743c1e6c398b5e96c76db69d41487c8f2ad94b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d743c1e6c398b5e96c76db69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 13 15:21:06 2021 +0200 server: Send TEB and PEB in the process_init_done request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 10 +++++----- include/wine/server_protocol.h | 8 ++++---- server/process.c | 4 ++++ server/protocol.def | 6 +++--- server/request.h | 14 +++++++------- server/thread.c | 9 --------- server/trace.c | 6 +++--- 7 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 8400c2930bb..db84fc16344 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1556,11 +1556,6 @@ size_t server_init_process(void) { req->unix_pid = getpid(); req->unix_tid = get_unix_tid(); - req->teb = wine_server_client_ptr( NtCurrentTeb() ); - req->peb = wine_server_client_ptr( NtCurrentTeb()->Peb ); -#ifdef __i386__ - req->ldt_copy = wine_server_client_ptr( &__wine_ldt_copy ); -#endif req->reply_fd = reply_pipe; req->wait_fd = ntdll_get_thread_data()->wait_fd[1]; req->debug_level = (TRACE_ON(server) != 0); @@ -1640,6 +1635,11 @@ void server_init_process_done(void) /* Signal the parent process to continue */ SERVER_START_REQ( init_process_done ) { + req->teb = wine_server_client_ptr( NtCurrentTeb() ); + req->peb = wine_server_client_ptr( NtCurrentTeb()->Peb ); +#ifdef __i386__ + req->ldt_copy = wine_server_client_ptr( &__wine_ldt_copy ); +#endif status = wine_server_call( req ); suspend = reply->suspend; entry = wine_server_get_ptr( reply->entry ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9fe826918fa..27557f2c1d7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -910,6 +910,9 @@ struct init_process_done_request { struct request_header __header; char __pad_12[4]; + client_ptr_t teb; + client_ptr_t peb; + client_ptr_t ldt_copy; }; struct init_process_done_reply { @@ -927,9 +930,6 @@ struct init_first_thread_request int unix_pid; int unix_tid; int debug_level; - client_ptr_t teb; - client_ptr_t peb; - client_ptr_t ldt_copy; int reply_fd; int wait_fd; }; @@ -6244,7 +6244,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 700 +#define SERVER_PROTOCOL_VERSION 701 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 17abd9800d2..491ab3b7bbd 100644 --- a/server/process.c +++ b/server/process.c @@ -1254,6 +1254,10 @@ DECL_HANDLER(init_process_done) } if (!(image_info = get_view_image_info( view, &base ))) return; + current->teb = req->teb; + process->peb = req->peb; + process->ldt_copy = req->ldt_copy; + process->start_time = current_time; current->entry_point = image_info->entry_point; diff --git a/server/protocol.def b/server/protocol.def index eaffa886f21..6d8208b128b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -898,6 +898,9 @@ typedef struct /* Signal the end of the process initialization */ @REQ(init_process_done) + client_ptr_t teb; /* TEB of new thread (in process address space) */ + client_ptr_t peb; /* PEB of new process (in process address space) */ + client_ptr_t ldt_copy; /* address of LDT copy (in process address space) */ @REPLY client_ptr_t entry; /* process entry point */ int suspend; /* is process suspended? */ @@ -909,9 +912,6 @@ typedef struct int unix_pid; /* Unix pid of new process */ int unix_tid; /* Unix tid of new thread */ int debug_level; /* new debug level */ - client_ptr_t teb; /* TEB of new thread (in process address space) */ - client_ptr_t peb; /* PEB of new process (in process address space) */ - client_ptr_t ldt_copy; /* address of LDT copy (in process address space) */ int reply_fd; /* fd for reply pipe */ int wait_fd; /* fd for blocking calls pipe */ @REPLY diff --git a/server/request.h b/server/request.h index ec5595bedf2..41810b89299 100644 --- a/server/request.h +++ b/server/request.h @@ -735,19 +735,19 @@ C_ASSERT( sizeof(struct new_thread_reply) == 16 ); C_ASSERT( sizeof(struct get_startup_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_startup_info_reply, info_size) == 8 ); C_ASSERT( sizeof(struct get_startup_info_reply) == 16 ); -C_ASSERT( sizeof(struct init_process_done_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct init_process_done_request, teb) == 16 ); +C_ASSERT( FIELD_OFFSET(struct init_process_done_request, peb) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_process_done_request, ldt_copy) == 32 ); +C_ASSERT( sizeof(struct init_process_done_request) == 40 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_reply, entry) == 8 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_reply, suspend) == 16 ); C_ASSERT( sizeof(struct init_process_done_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, unix_pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, unix_tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, debug_level) == 20 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, teb) == 24 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, peb) == 32 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, ldt_copy) == 40 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, reply_fd) == 48 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, wait_fd) == 52 ); -C_ASSERT( sizeof(struct init_first_thread_request) == 56 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, reply_fd) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, wait_fd) == 28 ); +C_ASSERT( sizeof(struct init_first_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, server_start) == 16 ); diff --git a/server/thread.c b/server/thread.c index 2f11d7d51c2..eb8b0de84b1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1407,17 +1407,8 @@ DECL_HANDLER(init_first_thread) if (!init_thread( current, req->reply_fd, req->wait_fd )) return; - if (!is_valid_address(req->teb) || !is_valid_address(req->peb)) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - current->unix_pid = process->unix_pid = req->unix_pid; current->unix_tid = req->unix_tid; - current->teb = req->teb; - process->peb = req->peb; - process->ldt_copy = req->ldt_copy; if (!process->parent_id) process->affinity = current->affinity = get_thread_affinity( current ); diff --git a/server/trace.c b/server/trace.c index e40f0769a35..ad7236dd393 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1440,6 +1440,9 @@ static void dump_get_startup_info_reply( const struct get_startup_info_reply *re static void dump_init_process_done_request( const struct init_process_done_request *req ) { + dump_uint64( " teb=", &req->teb ); + dump_uint64( ", peb=", &req->peb ); + dump_uint64( ", ldt_copy=", &req->ldt_copy ); } static void dump_init_process_done_reply( const struct init_process_done_reply *req ) @@ -1453,9 +1456,6 @@ static void dump_init_first_thread_request( const struct init_first_thread_reque fprintf( stderr, " unix_pid=%d", req->unix_pid ); fprintf( stderr, ", unix_tid=%d", req->unix_tid ); fprintf( stderr, ", debug_level=%d", req->debug_level ); - dump_uint64( ", teb=", &req->teb ); - dump_uint64( ", peb=", &req->peb ); - dump_uint64( ", ldt_copy=", &req->ldt_copy ); fprintf( stderr, ", reply_fd=%d", req->reply_fd ); fprintf( stderr, ", wait_fd=%d", req->wait_fd ); }

1 0

Alexandre Julliard : ntdll: Always send the native TEB pointer to the server.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 4dca2cc797c9951531257d9bd69f8c24c71b6c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dca2cc797c9951531257d9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 13 15:43:16 2021 +0200 ntdll: Always send the native TEB pointer to the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 20 ++++++++++++++++---- dlls/ntdll/tests/info.c | 5 +---- dlls/ntdll/unix/server.c | 18 ++++++++++++------ dlls/ntdll/unix/thread.c | 23 +++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 15 ++++++++++++--- server/debugger.c | 2 +- 6 files changed, 65 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4dca2cc797c995153125…

1 0

Alexandre Julliard : ntdll: Always send the native PEB pointer to the server.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 5864bc88de0e0a3b1094c2bb0c16ba9a5d39ce65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5864bc88de0e0a3b1094c2bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 13 15:58:33 2021 +0200 ntdll: Always send the native PEB pointer to the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 31 +++++++++++++++++++++++++++++-- dlls/ntdll/unix/process.c | 7 +++++++ dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/virtual.c | 8 ++++---- server/process.c | 5 +++++ 5 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6f5ee5d2079..213ff3cde36 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3133,6 +3133,9 @@ static void test_wow64(void) void *redir; SIZE_T res; TEB teb; + PEB peb; + TEB32 teb32; + PEB32 peb32; Wow64DisableWow64FsRedirection( &redir ); @@ -3161,14 +3164,39 @@ static void test_wow64(void) ok( (char *)teb.Tib.ExceptionList == (char *)info.TebBaseAddress + 0x2000, "wrong Tib.ExceptionList %p / %p\n", (char *)teb.Tib.ExceptionList, (char *)info.TebBaseAddress + 0x2000 ); + if (!ReadProcessMemory( pi.hProcess, teb.Tib.ExceptionList, &teb32, sizeof(teb32), &res )) res = 0; + ok( res == sizeof(teb32), "wrong len %lx\n", res ); + ok( (char *)ULongToPtr(teb32.Peb) == (char *)teb.Peb + 0x1000 || + broken( ULongToPtr(teb32.Peb) != teb.Peb ), /* vista */ + "wrong peb %p / %p\n", ULongToPtr(teb32.Peb), teb.Peb ); } status = pNtQueryInformationProcess( pi.hProcess, ProcessBasicInformation, &proc_info, sizeof(proc_info), NULL ); ok( !status, "ProcessBasicInformation failed %x\n", status ); - todo_wine_if( sizeof(void *) > sizeof(int) ) ok( proc_info.PebBaseAddress == teb.Peb, "wrong peb %p / %p\n", proc_info.PebBaseAddress, teb.Peb ); + if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; + ok( res == sizeof(peb), "wrong len %lx\n", res ); + ok( !peb.BeingDebugged, "BeingDebugged is %u\n", peb.BeingDebugged ); + if (!is_wow64) + { + if (!ReadProcessMemory( pi.hProcess, ULongToPtr(teb32.Peb), &peb32, sizeof(peb32), &res )) res = 0; + ok( res == sizeof(peb32), "wrong len %lx\n", res ); + ok( !peb32.BeingDebugged, "BeingDebugged is %u\n", peb32.BeingDebugged ); + } + + ok( DebugActiveProcess( pi.dwProcessId ), "debugging failed\n" ); + if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; + ok( res == sizeof(peb), "wrong len %lx\n", res ); + ok( peb.BeingDebugged == 1, "BeingDebugged is %u\n", peb.BeingDebugged ); + if (!is_wow64) + { + if (!ReadProcessMemory( pi.hProcess, ULongToPtr(teb32.Peb), &peb32, sizeof(peb32), &res )) res = 0; + ok( res == sizeof(peb32), "wrong len %lx\n", res ); + ok( peb32.BeingDebugged == 1, "BeingDebugged is %u\n", peb32.BeingDebugged ); + } + TerminateProcess( pi.hProcess, 0 ); CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); @@ -3196,7 +3224,6 @@ static void test_wow64(void) &proc_info, sizeof(proc_info), NULL ); ok( !status, "ProcessBasicInformation failed %x\n", status ); if (is_wow64) - todo_wine ok( !proc_info.PebBaseAddress || broken( (char *)proc_info.PebBaseAddress >= (char *)0x7f000000 ), /* vista */ "wrong peb %p\n", proc_info.PebBaseAddress ); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 79a4bbce7a8..74e16c36fd6 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -999,6 +999,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class pbi.BasePriority = reply->priority; pbi.UniqueProcessId = reply->pid; pbi.InheritedFromUniqueProcessId = reply->ppid; + if (is_wow64) + { + if (reply->machine != native_machine) + pbi.PebBaseAddress = (PEB *)((char *)pbi.PebBaseAddress + 0x1000); + else + pbi.PebBaseAddress = NULL; + } } } SERVER_END_REQ; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 31465c5e4dc..9f10bb135bd 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1638,7 +1638,7 @@ void server_init_process_done(void) SERVER_START_REQ( init_process_done ) { req->teb = wine_server_client_ptr( teb ); - req->peb = wine_server_client_ptr( NtCurrentTeb()->Peb ); + req->peb = NtCurrentTeb64() ? NtCurrentTeb64()->Peb : wine_server_client_ptr( peb ); #ifdef __i386__ req->ldt_copy = wine_server_client_ptr( &__wine_ldt_copy ); #endif diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 84a649398bc..bcecc21989a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2813,8 +2813,8 @@ NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_nam /* set some initial values in the new PEB */ static PEB *init_peb( void *ptr ) { - PEB32 *peb32 = ptr; - PEB64 *peb64 = (PEB64 *)((char *)ptr + page_size); + PEB64 *peb64 = ptr; + PEB32 *peb32 = (PEB32 *)((char *)ptr + page_size); peb32->OSMajorVersion = peb64->OSMajorVersion = 6; peb32->OSMinorVersion = peb64->OSMinorVersion = 1; @@ -2839,7 +2839,7 @@ static TEB *init_teb( void *ptr, PEB *peb, BOOL is_wow ) #ifdef _WIN64 teb = (TEB *)teb64; - teb32->Peb = PtrToUlong( (char *)peb - page_size ); + teb32->Peb = PtrToUlong( (char *)peb + page_size ); teb32->Tib.Self = PtrToUlong( teb32 ); teb32->Tib.ExceptionList = ~0u; teb32->ActivationContextStackPointer = PtrToUlong( &teb32->ActivationContextStack ); @@ -2853,7 +2853,7 @@ static TEB *init_teb( void *ptr, PEB *peb, BOOL is_wow ) if (is_wow) teb64->WowTebOffset = teb_offset; #else teb = (TEB *)teb32; - teb64->Peb = PtrToUlong( (char *)peb + page_size ); + teb64->Peb = PtrToUlong( (char *)peb - page_size ); teb64->Tib.Self = PtrToUlong( teb64 ); teb64->Tib.ExceptionList = PtrToUlong( teb32 ); teb64->ActivationContextStackPointer = PtrToUlong( &teb64->ActivationContextStack ); diff --git a/server/process.c b/server/process.c index 491ab3b7bbd..aab723114a8 100644 --- a/server/process.c +++ b/server/process.c @@ -1001,8 +1001,13 @@ void enum_processes( int (*cb)(struct process*, void*), void *user ) int set_process_debug_flag( struct process *process, int flag ) { char data = (flag != 0); + client_ptr_t peb32 = 0; + + if (!is_machine_64bit( process->machine ) && is_machine_64bit( supported_machines[0] )) + peb32 = process->peb + 0x1000; /* BeingDebugged flag is the byte at offset 2 in the PEB */ + if (peb32 && !write_process_memory( process, peb32 + 2, 1, &data )) return 0; return write_process_memory( process, process->peb + 2, 1, &data ); }

1 0