wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Józef Kucia : wined3d: Add support for ld_raw on thread group shared memory.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 3ab2482e0bfee233bd14da72671ebba7c07a8eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab2482e0bfee233bd14da726… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:40 2017 +0100 wined3d: Add support for ld_raw on thread group shared memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3f73201..c65bc69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5148,7 +5148,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) function = "texelFetch"; resource = "sampler"; } - else + else if (src->reg.type == WINED3DSPR_UAV) { if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) { @@ -5160,6 +5160,18 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) function = "imageLoad"; resource = "image"; } + else + { + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + stride = reg_maps->tgsm[resource_idx].stride; + bind_idx = resource_idx; + function = NULL; + resource = "g"; + } address = string_buffer_get(priv->string_buffers); if (ins->handler_idx == WINED3DSIH_LD_STRUCTURED) @@ -5178,8 +5190,12 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) continue; swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); - shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", - function, prefix, resource, bind_idx, address->buffer, swizzle); + if (function) + shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", + function, prefix, resource, bind_idx, address->buffer, swizzle); + else + shader_addline(buffer, "%s_%s%u[%s + %u]);\n", + prefix, resource, bind_idx, address->buffer, swizzle); } string_buffer_release(priv->string_buffers, address);

1 0

Józef Kucia : wined3d: Add shader_reg_maps_add_tgsm() helper function.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: fdca95efae785f7d07b156cdd7a76c5f145be108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdca95efae785f7d07b156cdd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:39 2017 +0100 wined3d: Add shader_reg_maps_add_tgsm() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 82 ++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f79a922..a97dfb1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -863,6 +863,33 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN } } +static HRESULT shader_reg_maps_add_tgsm(struct wined3d_shader_reg_maps *reg_maps, + unsigned int register_idx, unsigned int size, unsigned int stride) +{ + struct wined3d_shader_tgsm *tgsm; + + if (register_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", register_idx); + return S_OK; + } + if (reg_maps->shader_version.type != WINED3D_SHADER_TYPE_COMPUTE) + { + FIXME("TGSM declarations are allowed only in compute shaders.\n"); + return S_OK; + } + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + register_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + + reg_maps->tgsm_count = register_idx + 1; + tgsm = &reg_maps->tgsm[register_idx]; + tgsm->size = size; + tgsm->stride = stride; + return S_OK; +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -875,6 +902,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st struct wined3d_shader_version shader_version; const DWORD *ptr; unsigned int i; + HRESULT hr; memset(reg_maps, 0, sizeof(*reg_maps)); memset(input_signature_elements, 0, sizeof(input_signature_elements)); @@ -1049,55 +1077,17 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) { - unsigned int reg_idx = ins.declaration.tgsm_raw.reg.reg.idx[0].offset; - if (reg_idx >= MAX_TGSM_REGISTERS) - { - ERR("Invalid TGSM register index %u.\n", reg_idx); - break; - } - if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) - { - struct wined3d_shader_tgsm *tgsm; - - if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, - reg_idx + 1, sizeof(*reg_maps->tgsm))) - return E_OUTOFMEMORY; - reg_maps->tgsm_count = reg_idx + 1; - tgsm = &reg_maps->tgsm[reg_idx]; - tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; - tgsm->stride = 0; - } - else - { - FIXME("Invalid instruction %#x for shader type %#x.\n", - ins.handler_idx, shader_version.type); - } + if (FAILED(hr = shader_reg_maps_add_tgsm(reg_maps, ins.declaration.tgsm_raw.reg.reg.idx[0].offset, + ins.declaration.tgsm_raw.byte_count / 4, 0))) + return hr; } else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) { - unsigned int reg_idx = ins.declaration.tgsm_structured.reg.reg.idx[0].offset; - if (reg_idx >= MAX_TGSM_REGISTERS) - { - ERR("Invalid TGSM register index %u.\n", reg_idx); - break; - } - if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) - { - struct wined3d_shader_tgsm *tgsm; - - if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, - reg_idx + 1, sizeof(*reg_maps->tgsm))) - return E_OUTOFMEMORY; - reg_maps->tgsm_count = reg_idx + 1; - tgsm = &reg_maps->tgsm[reg_idx]; - tgsm->stride = ins.declaration.tgsm_structured.byte_stride / 4; - tgsm->size = tgsm->stride * ins.declaration.tgsm_structured.structure_count; - } - else - { - FIXME("Invalid instruction %#x for shader type %#x.\n", - ins.handler_idx, shader_version.type); - } + unsigned int stride = ins.declaration.tgsm_structured.byte_stride / 4; + unsigned int size = stride * ins.declaration.tgsm_structured.structure_count; + if (FAILED(hr = shader_reg_maps_add_tgsm(reg_maps, + ins.declaration.tgsm_structured.reg.reg.idx[0].offset, size, stride))) + return hr; } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) {

1 0

Józef Kucia : wined3d: Handle structured thread group shared memory declarations.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 7590a94dab25d1aeddbb053f46918efaf0ec4b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7590a94dab25d1aeddbb053f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:38 2017 +0100 wined3d: Handle structured thread group shared memory declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a034ba2..3f73201 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9462,7 +9462,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ shader_glsl_nop, - /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_STRUCTURED */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1b245d4..f79a922 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1065,6 +1065,33 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->tgsm_count = reg_idx + 1; tgsm = &reg_maps->tgsm[reg_idx]; tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; + tgsm->stride = 0; + } + else + { + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) + { + unsigned int reg_idx = ins.declaration.tgsm_structured.reg.reg.idx[0].offset; + if (reg_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", reg_idx); + break; + } + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) + { + struct wined3d_shader_tgsm *tgsm; + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + reg_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + reg_maps->tgsm_count = reg_idx + 1; + tgsm = &reg_maps->tgsm[reg_idx]; + tgsm->stride = ins.declaration.tgsm_structured.byte_stride / 4; + tgsm->size = tgsm->stride * ins.declaration.tgsm_structured.structure_count; } else { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5cc0136..a934cdb 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -774,6 +774,8 @@ static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instructio shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_structured.reg); ins->declaration.tgsm_structured.byte_stride = *tokens++; ins->declaration.tgsm_structured.structure_count = *tokens; + if (ins->declaration.tgsm_structured.byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.tgsm_structured.byte_stride); } static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d06962..675dd50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1006,6 +1006,7 @@ struct wined3d_shader_structured_resource struct wined3d_shader_tgsm { unsigned int size; + unsigned int stride; }; struct wined3d_shader_tgsm_raw

1 0

Józef Kucia : wined3d: Handle raw thread group shared memory declarations.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: bd6ae2f459fd905a8e2a5143c08f3167e6ea527c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6ae2f459fd905a8e2a5143c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:37 2017 +0100 wined3d: Handle raw thread group shared memory declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 9 ++++++++- dlls/wined3d/shader.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 10 ++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0fd463d..a034ba2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6833,6 +6833,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; + unsigned int i; shader_id = GL_EXTCALL(glCreateShader(GL_COMPUTE_SHADER)); @@ -6846,6 +6847,12 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * priv_ctx.string_buffers = string_buffers; shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + for (i = 0; i < reg_maps->tgsm_count; ++i) + { + if (reg_maps->tgsm[i].size) + shader_addline(buffer, "shared uint cs_g%u[%u];\n", i, reg_maps->tgsm[i].size); + } + shader_addline(buffer, "layout(local_size_x = %u, local_size_y = %u, local_size_z = %u) in;\n", thread_group_size->x, thread_group_size->y, thread_group_size->z); @@ -9454,7 +9461,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, - /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index fa61674..1b245d4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1047,6 +1047,31 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { reg_maps->temporary_count = ins.declaration.count; } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) + { + unsigned int reg_idx = ins.declaration.tgsm_raw.reg.reg.idx[0].offset; + if (reg_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", reg_idx); + break; + } + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) + { + struct wined3d_shader_tgsm *tgsm; + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + reg_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + reg_maps->tgsm_count = reg_idx + 1; + tgsm = &reg_maps->tgsm[reg_idx]; + tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; + } + else + { + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) @@ -1522,6 +1547,8 @@ static void shader_cleanup_reg_maps(struct wined3d_shader_reg_maps *reg_maps) LIST_FOR_EACH_ENTRY_SAFE(reg, reg_next, &reg_maps->indexable_temps, struct wined3d_shader_indexable_temp, entry) HeapFree(GetProcessHeap(), 0, reg); list_init(&reg_maps->indexable_temps); + + HeapFree(GetProcessHeap(), 0, reg_maps->tgsm); } unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_maps *reg_maps, unsigned int max) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 26aacc7..5cc0136 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -763,6 +763,8 @@ static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, { shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); ins->declaration.tgsm_raw.byte_count = *tokens; + if (ins->declaration.tgsm_raw.byte_count % 4) + FIXME("Byte count %u is not multiple of 4.\n", ins->declaration.tgsm_raw.byte_count); } static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b0d1a..3d06962 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -185,6 +185,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 #define MAX_UNORDERED_ACCESS_VIEWS 8 +#define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 #define MAX_MULTISAMPLE_TYPES 8 @@ -915,6 +916,10 @@ struct wined3d_shader_reg_maps /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; UINT min_rel_offset, max_rel_offset; + + struct wined3d_shader_tgsm *tgsm; + SIZE_T tgsm_capacity; + unsigned int tgsm_count; }; /* Keeps track of details for TEX_M#x# instructions which need to maintain @@ -998,6 +1003,11 @@ struct wined3d_shader_structured_resource unsigned int byte_stride; }; +struct wined3d_shader_tgsm +{ + unsigned int size; +}; + struct wined3d_shader_tgsm_raw { struct wined3d_shader_dst_param reg;

1 0

Piotr Caban : msvcp140: Add task_continuation_context constructor implementation.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 10b36e3977edb214f5451fcaf6f9c316465c01e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b36e3977edb214f5451fcaf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 1 13:18:01 2017 +0100 msvcp140: Add task_continuation_context constructor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 6 ++-- dlls/msvcp140/tests/msvcp140.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 17 ++++++++++ 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index ee31c77..9da2675 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -358,9 +358,9 @@ @ cdecl -arch=arm ??0ios_base@std@@IAA@XZ(ptr) ios_base_ctor @ thiscall -arch=i386 ??0ios_base@std@@IAE@XZ(ptr) ios_base_ctor @ cdecl -arch=win64 ??0ios_base@std@@IEAA@XZ(ptr) ios_base_ctor -@ stub -arch=arm ??0task_continuation_context@Concurrency@@AAA@XZ -@ stub -arch=i386 ??0task_continuation_context@Concurrency@@AAE@XZ -@ stub -arch=win64 ??0task_continuation_context@Concurrency@@AEAA@XZ +@ cdecl -arch=arm ??0task_continuation_context@Concurrency@@AAA@XZ(ptr) task_continuation_context_ctor +@ thiscall -arch=i386 ??0task_continuation_context@Concurrency@@AAE@XZ(ptr) task_continuation_context_ctor +@ cdecl -arch=win64 ??0task_continuation_context@Concurrency@@AEAA@XZ(ptr) task_continuation_context_ctor @ stub -arch=arm ??0time_base@std@@QAA@I@Z @ stub -arch=i386 ??0time_base@std@@QAE@I@Z @ stub -arch=win64 ??0time_base@std@@QEAA@_K@Z diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 82e2b34..db241ca 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -21,7 +21,57 @@ #include "wine/test.h" #include "winbase.h" +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) + +#endif /* __i386__ */ + +typedef struct { + void *unk0; + BYTE unk1; +} task_continuation_context; + static unsigned int (__cdecl *p__Thrd_id)(void); +static task_continuation_context* (__thiscall *p_task_continuation_context_ctor)(task_continuation_context*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -37,6 +87,17 @@ static BOOL init(void) SET(p__Thrd_id, "_Thrd_id"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AEAA@XZ"); + } else { +#ifdef __arm__ + SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAA@XZ"); +#else + SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAE@XZ"); +#endif + } + + init_thiscall_thunk(); return TRUE; } @@ -82,10 +143,21 @@ static void test_vbtable_size_exports(void) } } +static void test_task_continuation_context(void) +{ + task_continuation_context tcc; + + memset(&tcc, 0xdead, sizeof(tcc)); + call_func1(p_task_continuation_context_ctor, &tcc); + ok(!tcc.unk0, "tcc.unk0 != NULL (%p)\n", tcc.unk0); + ok(!tcc.unk1, "tcc.unk1 != 0 (%x)\n", tcc.unk1); +} + START_TEST(msvcp140) { if(!init()) return; test_thrd(); test_vbtable_size_exports(); + test_task_continuation_context(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 703ed9f..e819699 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1360,3 +1360,20 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) shared_ptr_lock = 0; } #endif + +#if _MSVCP_VER >= 140 +typedef struct { + void *unk0; + BYTE unk1; +} task_continuation_context; + +/* ??0task_continuation_context@Concurrency@@AAE@XZ */ +/* ??0task_continuation_context@Concurrency@@AEAA@XZ */ +DEFINE_THISCALL_WRAPPER(task_continuation_context_ctor, 4) +task_continuation_context* __thiscall task_continuation_context_ctor(task_continuation_context *this) +{ + TRACE("(%p)\n", this); + memset(this, 0, sizeof(*this)); + return this; +} +#endif

1 0

Huw Davies : oledb32: Fix conversion of strings with embedded '\0' to DBTYPE_STR | DBTYPE_BYREF.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: aedd6e951c4753b166f6c42ffa47557cfdfd2c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedd6e951c4753b166f6c42ff… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 11:32:07 2017 +0000 oledb32: Fix conversion of strings with embedded '\0' to DBTYPE_STR | DBTYPE_BYREF. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 4 ++-- dlls/oledb32/tests/convert.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index e3e29e0..eadac76 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -876,13 +876,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, precision, scale, flags); if(hr != S_OK) return hr; - length = WideCharToMultiByte(CP_ACP, 0, b, -1, NULL, 0, NULL, NULL); + length = WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b) + 1, NULL, 0, NULL, NULL); *dst_len = length - 1; /* Doesn't include size for '\0' */ *dst_status = DBSTATUS_S_OK; *d = CoTaskMemAlloc(length); if(*d) - WideCharToMultiByte(CP_ACP, 0, b, -1, *d, length, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b) + 1, *d, length, NULL, NULL); else hr = E_OUTOFMEMORY; SysFreeString(b); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 663f78e..5d0fd17 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2155,6 +2155,7 @@ static void test_converttobyrefstr(void) DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; + static const char withnull[] = "test\0ed"; BSTR b; VARIANT v; @@ -2232,6 +2233,37 @@ static void test_converttobyrefstr(void) ok(!lstrcmpA("10", dst), "got %s\n", dst); CoTaskMemFree(dst); + memcpy(src, withnull, sizeof(withnull)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR | DBTYPE_BYREF, sizeof(withnull), &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 8), "got %s\n", dst); + ok(dst[8] == 0, "got %02x\n", dst[8]); + CoTaskMemFree(dst); + + memcpy(src, withnull, sizeof(withnull)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR | DBTYPE_BYREF, 7, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 7, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 7), "got %s\n", dst); + ok(dst[7] == 0, "got %02x\n", dst[7]); + CoTaskMemFree(dst); + + memcpy(src, withnull, sizeof(withnull)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR | DBTYPE_BYREF, 6, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 6, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 6), "got %s\n", dst); + ok(dst[6] == 0, "got %02x\n", dst[6]); + CoTaskMemFree(dst); + + dst_len = 44; V_VT(&v) = VT_NULL; hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_STR | DBTYPE_BYREF, 0, &dst_len, &v, dst, sizeof(dst), 0, &dst_status, 0, 0, 0);

1 0

Alistair Leslie-Hughes : oledb32/tests: Add tests for conversion to DBTYPE_STR.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 853de70bc0279bc6805dce81d89186b70734e5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=853de70bc0279bc6805dce81d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 1 11:32:06 2017 +0000 oledb32/tests: Add tests for conversion to DBTYPE_STR. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 0e4a834..663f78e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1516,6 +1516,9 @@ static void test_converttostr(void) DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; + static const WCHAR idW[] = {'0','C','7','3','3','A','8','D','-','2','A','1','C',0 }; + static const char idA[] = "0C733A8D"; + static const char withnull[] = "test\0ed"; static const char ten_a[] = "10"; static const char fourthreetwoone[] = "4321"; static const char guid_str[] = "{0C733A8D-2A1C-11CE-ADE5-00AA0044773D}"; @@ -1877,6 +1880,47 @@ static void test_converttostr(void) ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); SysFreeString(b); + b = SysAllocString(idW); + *(BSTR *)src = b; + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_STR, 0, &dst_len, src, dst, 9, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 13, "got %ld\n", dst_len); + ok(!lstrcmpA(idA, dst), "got %s\n", dst); + SysFreeString(b); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, sizeof(withnull), &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 8), "got %s\n", dst); + ok(dst[8] == 0, "got %02x\n", dst[8]); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 7, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 7, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 7), "got %s\n", dst); + ok(dst[7] == 0, "got %02x\n", dst[7]); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 6, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 6, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 6), "got %s\n", dst); + ok(dst[6] == 0, "got %02x\n", dst[6]); + memcpy(src, ten, sizeof(ten)); memset(dst, 0xcc, sizeof(dst)); dst_len = 0x1234;

1 0

Huw Davies : oledb32: Fixed length calculation in conversion to DBTYPE_STR.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 28debe67d251f91400f4d23e23795a853eda5fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=28debe67d251f91400f4d23e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 11:32:05 2017 +0000 oledb32: Fixed length calculation in conversion to DBTYPE_STR. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ac462f2..e3e29e0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -813,26 +813,27 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, SysFreeString(b); return hr; } + case DBTYPE_STR: { BSTR b; - DBLENGTH bstr_len; + DBLENGTH length; INT bytes_to_copy; - hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &length, src, &b, sizeof(BSTR), src_status, dst_status, precision, scale, flags); if(hr != S_OK) return hr; - bstr_len = SysStringLen(b); - *dst_len = bstr_len * sizeof(char); /* Doesn't include size for '\0' */ + length = WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b), NULL, 0, NULL, NULL); + *dst_len = length; /* Doesn't include size for '\0' */ *dst_status = DBSTATUS_S_OK; - bytes_to_copy = min(*dst_len + sizeof(char), dst_max_len); + bytes_to_copy = min(length + 1, dst_max_len); if(dst) { if(bytes_to_copy >= sizeof(char)) { - WideCharToMultiByte(CP_ACP, 0, b, bytes_to_copy - sizeof(char), dst, dst_max_len, NULL, NULL); - *((char *)dst + bytes_to_copy / sizeof(char) - 1) = 0; - if(bytes_to_copy < *dst_len + sizeof(char)) + WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b), dst, bytes_to_copy - 1, NULL, NULL); + *((char *)dst + bytes_to_copy - 1) = 0; + if(bytes_to_copy < length + 1) *dst_status = DBSTATUS_S_TRUNCATED; } else

1 0

Henri Verbeet : usp10: Use USP10_FindGlyphInLogClust() in UpdateClusters() .
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 1727dd41568cc445cf33e211f580ca706b622f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1727dd41568cc445cf33e211f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:56 2017 +0100 usp10: Use USP10_FindGlyphInLogClust() in UpdateClusters(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8daefcc..9e0addc 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -753,11 +753,9 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch { int i; int target_glyph = nextIndex - write_dir; - int seeking_glyph; int target_index = -1; int replacing_glyph = -1; int changed = 0; - int top_logclust = 0; if (changeCount > 0) { @@ -767,35 +765,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch target_glyph = nextIndex + (changeCount + 1); } - seeking_glyph = target_glyph; - for (i = 0; i < chars; i++) - if (pwLogClust[i] > top_logclust) - top_logclust = pwLogClust[i]; - - do { - if (write_dir > 0) - for (i = 0; i < chars; i++) - { - if (pwLogClust[i] == seeking_glyph) - { - target_index = i; - break; - } - } - else - for (i = chars - 1; i >= 0; i--) - { - if (pwLogClust[i] == seeking_glyph) - { - target_index = i; - break; - } - } - if (target_index == -1) - seeking_glyph ++; - } - while (target_index == -1 && seeking_glyph <= top_logclust); - + target_index = USP10_FindGlyphInLogClust(pwLogClust, chars, target_glyph); if (target_index == -1) { ERR("Unable to find target glyph\n");

1 0

Henri Verbeet : usp10: Use memmove() in GSUB_apply_LigatureSubst().
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: bab506e1cd99d1284cb6bfe05610a2416d04b6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab506e1cd99d1284cb6bfe05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:55 2017 +0100 usp10: Use memmove() in GSUB_apply_LigatureSubst(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 4f3b559..3bbf5ec 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1058,9 +1058,8 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN TRACE("0x%x\n",glyphs[replaceIdx]); if (CompCount > 0) { - int j; - for (j = replaceIdx + 1; j < *glyph_count; j++) - glyphs[j] =glyphs[j+CompCount]; + unsigned int j = replaceIdx + 1; + memmove(&glyphs[j], &glyphs[j + CompCount], (*glyph_count - j) * sizeof(*glyphs)); *glyph_count = *glyph_count - CompCount; } return replaceIdx + write_dir;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017