March 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Add support for atomic operations on thread group shared memory.
by Alexandre Julliard March 2, 2017

March 2, 2017

Module: wine Branch: master Commit: 63b1ad59a39433ba4a4f0a75d984bfba13890a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b1ad59a39433ba4a4f0a75d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:27 2017 +0100 wined3d: Add support for atomic operations 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 | 83 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b613319..51deae0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4971,34 +4971,66 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) enum wined3d_shader_resource_type resource_type; struct wined3d_string_buffer *address; enum wined3d_data_type data_type; - unsigned int uav_idx, stride; + unsigned int resource_idx, stride; + const char *op, *resource; DWORD coord_mask; - const char *op; + BOOL is_tgsm; - uav_idx = ins->dst[is_imm_instruction].reg.idx[0].offset; - resource_type = reg_maps->uav_resource_info[uav_idx].type; - if (resource_type >= ARRAY_SIZE(resource_type_info)) + resource_idx = ins->dst[is_imm_instruction].reg.idx[0].offset; + is_tgsm = ins->dst[is_imm_instruction].reg.type == WINED3DSPR_GROUPSHAREDMEM; + if (is_tgsm) { - ERR("Unexpected resource type %#x.\n", resource_type); - return; + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + resource = "g"; + data_type = WINED3D_DATA_UINT; + coord_mask = 1; + stride = reg_maps->tgsm[resource_idx].stride; + } + else + { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + resource_type = reg_maps->uav_resource_info[resource_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + resource = "image"; + data_type = reg_maps->uav_resource_info[resource_idx].data_type; + coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + stride = reg_maps->uav_resource_info[resource_idx].stride; } - data_type = reg_maps->uav_resource_info[uav_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; - stride = reg_maps->uav_resource_info[uav_idx].stride; switch (ins->handler_idx) { case WINED3DSIH_ATOMIC_AND: case WINED3DSIH_IMM_ATOMIC_AND: - op = "imageAtomicAnd"; + if (is_tgsm) + op = "atomicAnd"; + else + op = "imageAtomicAnd"; break; case WINED3DSIH_ATOMIC_CMP_STORE: case WINED3DSIH_IMM_ATOMIC_CMP_EXCH: - op = "imageAtomicCompSwap"; + if (is_tgsm) + op = "atomicCompSwap"; + else + op = "imageAtomicCompSwap"; break; case WINED3DSIH_ATOMIC_IADD: case WINED3DSIH_IMM_ATOMIC_IADD: - op = "imageAtomicAdd"; + if (is_tgsm) + op = "atomicAdd"; + else + op = "imageAtomicAdd"; break; case WINED3DSIH_ATOMIC_IMAX: case WINED3DSIH_IMM_ATOMIC_IMAX: @@ -5020,7 +5052,10 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_OR: case WINED3DSIH_IMM_ATOMIC_OR: - op = "imageAtomicOr"; + if (is_tgsm) + op = "atomicOr"; + else + op = "imageAtomicOr"; break; case WINED3DSIH_ATOMIC_UMAX: case WINED3DSIH_IMM_ATOMIC_UMAX: @@ -5042,10 +5077,16 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_XOR: case WINED3DSIH_IMM_ATOMIC_XOR: - op = "imageAtomicXor"; + if (is_tgsm) + op = "atomicXor"; + else + op = "imageAtomicXor"; break; case WINED3DSIH_IMM_ATOMIC_EXCH: - op = "imageAtomicExchange"; + if (is_tgsm) + op = "atomicExchange"; + else + op = "imageAtomicExchange"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -5063,15 +5104,19 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &offset); string_buffer_sprintf(address, "%s", offset.param_str); - if (reg_maps->uav_resource_info[uav_idx].flags & WINED3D_VIEW_BUFFER_RAW) + if (reg_maps->uav_resource_info[resource_idx].flags & WINED3D_VIEW_BUFFER_RAW) shader_addline(address, "/ 4"); } if (is_imm_instruction) shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], data_type); - shader_addline(buffer, "%s(%s_image%u, %s, ", - op, shader_glsl_get_prefix(version->type), uav_idx, address->buffer); + if (is_tgsm) + shader_addline(buffer, "%s(%s_%s%u[%s], ", + op, shader_glsl_get_prefix(version->type), resource, resource_idx, address->buffer); + else + shader_addline(buffer, "%s(%s_%s%u, %s, ", + op, shader_glsl_get_prefix(version->type), resource, resource_idx, address->buffer); shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data, data_type); shader_addline(buffer, "%s", data.param_str);

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard March 2, 2017

March 2, 2017

Module: wine Branch: master Commit: 9333f6e3300bb29a8012815433c0075ab1072bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9333f6e3300bb29a801281543… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:43:57 2017 +0200 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.fi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 5e03199..4109090 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -12,11 +12,10 @@ lisenssistä on englanniksi tiedostossa LICENSE. 2. PIKAOPAS -Kun Wine käännetään lähdekoodeistaan, on suositeltavaa käyttää Winen omaa -asennusohjelmaa, joka ajetaan seuraavalla komennolla Winen lähdekoodin -juurihakemistosta: +Aja Winen lähdekoodin juurihakemistossa seuraavat komennot: -./tools/wineinstall +./configure +make Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä @@ -81,8 +80,7 @@ Valinnaisia tukikirjastoja: 4. KÄÄNTÄMINEN -Aiemmin mainitun wineinstall-skriptin sijaan Winen voi kääntää myös -seuraavilla komennoilla: +Winen voi kääntää seuraavilla komennoilla: ./configure make @@ -95,6 +93,8 @@ kääntämiseen Unixissa. Komento './configure --help' näyttää asetuksia ja valintoja, joita käännösprosessiin voi lisätä. +Lisätietoja on osoitteessa https://wiki.winehq.org/Building_Wine + 5. ASENNUS Kun Wine on käännetty, komento "make install" asentaa Winen sekä sen man-sivut

1 0

Bruno Jesus : winmm: Cope with empty string in mciSendString.
by Alexandre Julliard March 2, 2017

March 2, 2017

Module: wine Branch: master Commit: 4c46b3d0912c207fcc69956e6ceb5aa4f1e74e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c46b3d0912c207fcc69956e6… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Wed Mar 1 01:18:20 2017 -0300 winmm: Cope with empty string in mciSendString. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mci.c | 3 +++ dlls/winmm/tests/mci.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b8adea6..f772388 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1343,6 +1343,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); if (lpstrRet && uRetLen) *lpstrRet = '\0'; + if (!lpstrCommand[0]) + return MCIERR_MISSING_COMMAND_STRING; + /* format is <command> <device> <optargs> */ if (!(verb = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpstrCommand)+1) * sizeof(WCHAR)))) return MCIERR_OUT_OF_MEMORY; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 9ff6c58..52790c8 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -198,7 +198,7 @@ static void test_mciParser(HWND hwnd) buf[0]='z'; err = mciSendStringA("", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err)); + ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err)); ok(!buf[0], "error buffer %s\n", buf); buf[0]='d';

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 2, 2017

March 2, 2017

Module: wine Branch: master Commit: ded35e312c8f3f328d82674999b53bb053aba629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded35e312c8f3f328d8267499… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:35:46 2017 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index f786d63..e7a7059 100644 --- a/po/fi.po +++ b/po/fi.po @@ -12197,17 +12197,13 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Vie rekisterin valitun haaran tekstitiedostoon" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Vahvista arvon tuhoaminen" +msgstr "Vahvista avaimen tuhoaminen" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?" +msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1' ja sen aliavaimet?" #: regsvr32.rc:32 msgid ""

1 0

Józef Kucia : wined3d: Don' t leak texture in wined3d_unordered_access_view_destroy_object().
by Alexandre Julliard March 2, 2017

March 2, 2017

Module: wine Branch: master Commit: b5b26c204f9905d8c2c41817691d1b275d6f9659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b26c204f9905d8c2c418176… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 09:44:29 2017 +0100 wined3d: Don't leak texture in wined3d_unordered_access_view_destroy_object(). 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/view.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a74a2ea..a8e69fc 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -673,7 +673,21 @@ ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access static void wined3d_unordered_access_view_destroy_object(void *object) { - HeapFree(GetProcessHeap(), 0, object); + struct wined3d_unordered_access_view *view = object; + + if (view->gl_view.name) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(view->resource->device, NULL, 0); + gl_info = context->gl_info; + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + checkGLcall("glDeleteTextures"); + context_release(context); + } + + HeapFree(GetProcessHeap(), 0, view); } ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view)

1 0

Józef Kucia : wined3d: Add ARB_shader_storage_buffer_object extension.
by Alexandre Julliard March 2, 2017

March 2, 2017

Module: wine Branch: master Commit: 700dd3518b5e4f8a18fe9ee953e66cada264fa8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=700dd3518b5e4f8a18fe9ee95… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:30 2017 +0100 wined3d: Add ARB_shader_storage_buffer_object extension. Nvidia binary drivers require the ARB_shader_storage_buffer_object extension to be enabled in order to use atomic operations on compute shader shared variables. 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/directx.c | 4 ++++ dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02df3f0..5fa34e5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -150,6 +150,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, + {"GL_ARB_shader_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT}, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, @@ -2832,6 +2833,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glUniformMatrix4fvARB) USE_GL_FUNC(glUseProgramObjectARB) USE_GL_FUNC(glValidateProgramARB) + /* GL_ARB_shader_storage_buffer_object */ + USE_GL_FUNC(glShaderStorageBlockBinding) /* GL_ARB_sync */ USE_GL_FUNC(glClientWaitSync) USE_GL_FUNC(glDeleteSync) @@ -3774,6 +3777,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, + {ARB_SHADER_STORAGE_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5dd567..d6bb622 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6613,6 +6613,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_SIZE]) shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); + if (gl_info->supported[ARB_SHADER_STORAGE_BUFFER_OBJECT]) + shader_addline(buffer, "#extension GL_ARB_shader_storage_buffer_object : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 396f93f..fa5985c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -83,6 +83,7 @@ enum wined3d_gl_extension ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_IMAGE_SIZE, + ARB_SHADER_STORAGE_BUFFER_OBJECT, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADING_LANGUAGE_420PACK,

1 0

Józef Kucia : wined3d: Add support for store_{raw, structured} on thread group shared memory.
by Alexandre Julliard March 2, 2017

March 2, 2017

Module: wine Branch: master Commit: 5b43b83539e7ac76ef1034a85fd977bddfe81fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b43b83539e7ac76ef1034a85… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:28 2017 +0100 wined3d: Add support for store_{raw, structured} 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 | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51deae0..61865c1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5278,30 +5278,44 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) image_coord_param.param_str, image_data_param.param_str); } -static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *ins) +static void shader_glsl_store_raw_structured(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset, data; + unsigned int i, resource_idx, stride, src_idx = 0; struct wined3d_string_buffer *address; - unsigned int i, uav_idx, src_idx = 0; DWORD write_mask; + BOOL is_tgsm; - uav_idx = ins->dst[0].reg.idx[0].offset; - if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + resource_idx = ins->dst[0].reg.idx[0].offset; + is_tgsm = ins->dst[0].reg.type == WINED3DSPR_GROUPSHAREDMEM; + if (is_tgsm) { - ERR("Invalid UAV index %u.\n", uav_idx); - return; + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + stride = reg_maps->tgsm[resource_idx].stride; + } + else + { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + stride = reg_maps->uav_resource_info[resource_idx].stride; } address = string_buffer_get(priv->string_buffers); if (ins->handler_idx == WINED3DSIH_STORE_STRUCTURED) { shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &structure_idx); - shader_addline(address, "%s * %u + ", structure_idx.param_str, - reg_maps->uav_resource_info[uav_idx].stride); + shader_addline(address, "%s * %u + ", structure_idx.param_str, stride); } shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &offset); shader_addline(address, "%s / 4", offset.param_str); @@ -5313,8 +5327,12 @@ static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *in shader_glsl_add_src_param(ins, &ins->src[src_idx], write_mask, &data); - shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n", - prefix, uav_idx, address->buffer, i, data.param_str); + if (is_tgsm) + shader_addline(buffer, "%s_g%u[%s + %u] = %s;\n", + prefix, resource_idx, address->buffer, i, data.param_str); + else + shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n", + prefix, resource_idx, address->buffer, i, data.param_str); } string_buffer_release(priv->string_buffers, address); @@ -9653,8 +9671,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, - /* WINED3DSIH_STORE_RAW */ shader_glsl_store_buffer, - /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_buffer, + /* WINED3DSIH_STORE_RAW */ shader_glsl_store_raw_structured, + /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_raw_structured, /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL,

1 0

Piotr Caban : msvcp140: Add task_continuation_context constructor implementation.
by Alexandre Julliard March 1, 2017

March 1, 2017

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(a)std@@IAA(a)XZ(ptr) ios_base_ctor @ thiscall -arch=i386 ??0ios_base(a)std@@IAE(a)XZ(ptr) ios_base_ctor @ cdecl -arch=win64 ??0ios_base(a)std@@IEAA(a)XZ(ptr) ios_base_ctor -@ stub -arch=arm ??0task_continuation_context(a)Concurrency@@AAA(a)XZ -@ stub -arch=i386 ??0task_continuation_context(a)Concurrency@@AAE(a)XZ -@ stub -arch=win64 ??0task_continuation_context(a)Concurrency@@AEAA(a)XZ +@ cdecl -arch=arm ??0task_continuation_context(a)Concurrency@@AAA(a)XZ(ptr) task_continuation_context_ctor +@ thiscall -arch=i386 ??0task_continuation_context(a)Concurrency@@AAE(a)XZ(ptr) task_continuation_context_ctor +@ cdecl -arch=win64 ??0task_continuation_context(a)Concurrency@@AEAA(a)XZ(ptr) task_continuation_context_ctor @ stub -arch=arm ??0time_base(a)std@@QAA(a)I@Z @ stub -arch=i386 ??0time_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0time_base(a)std@@QEAA(a)_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(a)Concurrency@@AEAA(a)XZ"); + } else { +#ifdef __arm__ + SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAA(a)XZ"); +#else + SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAE(a)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(a)Concurrency@@AAE(a)XZ */ +/* ??0task_continuation_context(a)Concurrency@@AEAA(a)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 March 1, 2017

March 1, 2017

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

Huw Davies : dsound: Use frame rather than byte counts to clarify the mixing.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 134b684fd90423490e7eb2395db88df683d8fdc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134b684fd90423490e7eb2395… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:00:59 2017 +0000 dsound: Use frame rather than byte counts to clarify the mixing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 93 ++++++++++++++++++++------------------------ dlls/dsound/primary.c | 8 ++-- 3 files changed, 47 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=134b684fd90423490e7eb…

1 0